aboutsummaryrefslogtreecommitdiff
path: root/nixos (follow)
Commit message (Collapse)AuthorAgeFilesLines
* nixos: release-combined: only build the amazon image for ↵Graham Christensen2020-11-191-1/+1
| | | | x86_64,aarch64-linux -- exclude i686
* Merge pull request #104322 from grahamc/amazon-imageGraham Christensen2020-11-191-1/+1
|\ | | | | nixos/release-small: add amazonImage
| * nixos/release-small: add amazonImageGraham Christensen2020-11-191-1/+1
| | | | | | | | fixup breakage from #104193
* | Merge pull request #104193 from grahamc/ec2-metadata-imdsv2Graham Christensen2020-11-196-6/+88
|\ \ | | | | | | NixOS EC2 AMI: Support IMDSv2
| * | nixos: release: add amazonImage as a channel blockerGraham Christensen2020-11-192-0/+2
| | |
| * | nixos ami: preflight the imds tokenGraham Christensen2020-11-191-0/+21
| | | | | | | | | | | | | | | | | | 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.
| * | nixos: ec2 ami: support IMDSv2Graham Christensen2020-11-192-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | nixos: openstack: have its own metadata fetcher expressionGraham Christensen2020-11-182-1/+24
| | | | | | | | | | | | These two APIs have diverged over time and are no longer compatible.
* | | Merge pull request #104271 from adisbladis/dockertools-crossRobert Hensing2020-11-191-0/+12
|\ \ \ | |_|/ |/| | dockerTools.buildLayeredImage: Fix cross compilation
| * | dockerTools: Add cross compilation testadisbladis2020-11-191-0/+12
| | |
* | | Merge pull request #104105 from spacefrogg/openafs-1.9Jörg Thalheim2020-11-192-1/+6
|\ \ \ | |/ / |/| |
| * | openafs: remove 1.6; point to openafs_1_8Michael Raitza2020-11-172-1/+6
| | |
* | | Merge pull request #96371 from asdf8dfafjk/fcitx_commitRobert Hensing2020-11-194-0/+159
|\ \ \ | | | | | | | | fcitx: Add test (Unicode input, table input, m17n)
| * | | Copy config file, no via-store, short config_2020-08-263-168/+3
| | | |
| * | | fcitx: Add test (Unicode input, table input, m17n)_2020-08-264-0/+324
| | | |
* | | | Merge pull request #98980 from JustinLovinger/idmapdSilvan Mosberger2020-11-181-13/+35
|\ \ \ \ | | | | | | | | | | nixos/nfs: add idmapd.settings option
| * | | | nixos/nfs: add idmapd.settings optionJustin Lovinger2020-10-201-13/+35
| | | | | | | | | | | | | | | | | | | | Co-authored-by: Aaron Andersen <aaron@fosslib.net>
* | | | | nixos/telegraf: fix testJörg Thalheim2020-11-181-2/+2
| | | | |
* | | | | nixos/telegraf: make example a bit more compactJörg Thalheim2020-11-181-10/+6
| | | | |
* | | | | nixos/telegraf: null value for environmentFiles is invalidJörg Thalheim2020-11-181-1/+1
| |_|_|/ |/| | | | | | | | | | | it's also not needed given that empty list covers all use cases.
* | | | nixos: use nativeBuildInputs in make- iso9660-image and system-tarballEmery Hemingway2020-11-182-2/+2
| |_|/ |/| | | | | | | | | | | The tools used to create iso9660 images and tarballs are independent of the platform of the closure contained within.
* | | Merge #103633: kresd service: switch .listenDoHVladimír Čunát2020-11-171-8/+4
|\ \ \ | | | | | | | | | | | | ... to new implementation - and a couple other improvements.
| * | | kresd service: switch .listenDoH to new implementationVladimír Čunát2020-11-171-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Beware: extraFeatures are not needed *for this* anymore, but their removal may still cause a regression in some configs (example: prefill module).
* | | | Merge pull request #104018 from NeQuissimus/xterm_updateTim Steinbach2020-11-172-0/+24
|\ \ \ \ | | | | | | | | | | xterm: 353 -> 362, add test, add update script
| * | | | xterm: Add testTim Steinbach2020-11-162-0/+24
| | | | |
* | | | | Merge pull request #103988 from NeQuissimus/nano_updateTim Steinbach2020-11-173-0/+46
|\ \ \ \ \ | | | | | | | | | | | | nano: Update script, test
| * | | | | nano: Add testTim Steinbach2020-11-163-0/+46
| | | | | |
* | | | | | maintainers: rename filalex77 -> Br1ght0neOleksii Filonenko2020-11-173-3/+3
| | | | | |
* | | | | | Merge pull request #103876 from Mic92/lvm-generator-fixJörg Thalheim2020-11-161-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | nixos/lvm2-activation-generator: fix warnings on activation
| * | | | | nixos/lvm2-activation-generator: fix warnings on activationJörg Thalheim2020-11-151-0/+4
| |/ / / /
* | | | | Merge pull request #103966 from flokli/kernel-enable-ipv6Florian Klink2020-11-161-1/+0
|\ \ \ \ \ | | | | | | | | | | | | kernel config: explicitly enable CONFIG_IPV6
| * | | | | kernel config: explicitly enable CONFIG_IPV6Florian Klink2020-11-161-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #103462 from NixOS/staging-nextFrederik Rietdijk2020-11-161-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Staging next
| * | | | | Merge master into staging-nextFrederik Rietdijk2020-11-162-12/+35
| |\| | | |
| * | | | | Merge master into staging-nextFrederik Rietdijk2020-11-1312-115/+196
| |\ \ \ \ \
| * \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2020-11-1112-23/+174
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2020-11-107-21/+70
| |\ \ \ \ \ \ \
| * | | | | | | | rubyMinimal: removeDoron Behar2020-11-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to being unused, and seemingly unusable, added appropriate release notes.
* | | | | | | | | Merge pull request #103717 from WilliButz/codimd/add-package-optionMaximilian Bosch2020-11-161-4/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos/codimd: add package option, refactor prettyJSON
| * | | | | | | | | nixos/codimd: add package option, refactor prettyJSONWilliButz2020-11-131-4/+13
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `package` option to allow for easier overriding of the used CodiMD version and `runCommandLocal` with `nativeBuildInputs` is now used to pretty print the configuration.
* | | | | | | | | Merge pull request #102916 from andir/nixos-helpAndreas Rammhold2020-11-161-13/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | nixos-help: fixup .desktop file & smaller refactoring
| * | | | | | | | nixos-help: bundle the desktop item with the scriptAndreas Rammhold2020-11-051-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to ensure that whenever we install the desktop item we also have the script installed. Prior to b02719a we always had the reference to the script in the desktop item. Since desktop items are being copied to home directories and thus "bit rod" over time that absolute path was removed.
| * | | | | | | | nixos-help: use writeShellScriptBin and drop custom shebang lineAndreas Rammhold2020-11-051-2/+1
| | | | | | | | |
| * | | | | | | | nixos-help: Do $PATH lookup in nixos-manual.desktop instead of hardcoding ↵Klemens Nanni2020-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | derivation See db236e588de "steam: Do $PATH lookup in steam.desktop [...]". tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.
* | | | | | | | | Merge pull request #98025 from Mic92/telegrafJörg Thalheim2020-11-142-12/+35
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | nixos/telegraf: allow multiple env filesJörg Thalheim2020-11-142-8/+8
| | | | | | | | |
| * | | | | | | | nixos/telegraf: switch to setting typesJörg Thalheim2020-11-142-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to split up configuration into multiple modules
| * | | | | | | | nixos/telegraf: add environmentFile optionJörg Thalheim2020-11-141-2/+23
| | | | | | | | |
| * | | | | | | | nixos/telegraf: add support for native pingJörg Thalheim2020-11-141-0/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #75615 from FSMaxB/patch-1Doron Behar2020-11-131-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add note about installing NixOS from distributions with /usr/sbin and…