1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 18:12:46 +00:00
Commit graph

22583 commits

Author SHA1 Message Date
Ben Siraphob 4ef4a1e62a
Merge pull request #131967 from vcunat/p/etc_os-release
nixos/version: make versions in /etc/os-release less verbose
2021-08-02 15:39:31 +07:00
Luke Granger-Brown 5a7d7dc19f nixos/display-managers: update set-session for new "SessionType" property
GDM 40.1 switched from storing X11 sessions in the "XSession" property
on AccountService to "Session" with a "x11" "SessionType".

For compatibility reasons, we should set both, since AccountService
doesn't seem to provide the compatibility for us.
2021-08-01 22:22:35 +00:00
Robert Hensing 151c2f5a20
Merge pull request #131814 from blaggacao/fix-nix-daemon-registry-type-unspecified-error
nixos/nix-daemon: fix registry flake type
2021-08-01 22:43:34 +02:00
Aaron Andersen 4fad3a2b69
Merge pull request #131020 from Artturin/uptimed-fix
uptimed nixos/uptimed: switch to /var/lib/ and fix perms
2021-08-01 15:58:36 -04:00
Aaron Andersen 7841f5f4eb
Merge pull request #129861 from vs49688/giteafix
modules/gitea: use gitea to refresh hooks and keys
2021-08-01 15:57:11 -04:00
David Arnold ecae25c3ef
nixos/nix-daemon: fix registry flake type
Before this commit, the `flake` option was typed with `types.unspecified`.

This type get's merged via [`mergeDefaultOption`](ebb592a04c/lib/options.nix (L119-L128)), which has a line
```nix
else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
```

`lib.isFunction` detects an attrs in the shape of `{__functor = ...}` as
a function and hence this line substitutes such attrs with a function
(f: f x).

If now, a flake input has a `__functor` as it's output, this will
coerce the once attrs to a function. This breaks a lot of things later
in the stack, for example a later `lib.filterAttrs seive <LAMBDA>` will
fail for obious reasons.

According to @infinisil, `types.unspecified` is due to deprecation. In
the meantime this PR provides a specific fix for the specific problem
discovered.
2021-08-01 14:56:13 -05:00
Luke Granger-Brown b5fab53628 nixos/virtualbox-image: cast baseImageFreeSpace into str
This fixes an evaluation error that's blocking the nixos-unstable
channel (#132328).
2021-08-01 18:59:08 +00:00
Benjamin Asbach f22a7ae1a8
soapui: 5.5.0 -> 5.6.0 (#131307)
Co-authored-by: Benjamin Asbach <asbachb@users.noreply.github.com>
2021-08-01 20:11:12 +02:00
Naïm Favier 12bbb0fd7b
nixos/syncthing: fix curl not retrying on network errors 2021-08-01 15:03:41 +02:00
Profpatsch 6376458424 sane: Add support for the unfree Fujitsu ScanSnap drivers
This adds the scanner files already linked from the
`etc/sane.d/epjitsu.conf` file, which are extracted from the Windows
drivers and mirrored on GitHub.

Being a Japanese hardware vendor, Fujitsu’s software release &
licensing methods are horrifying, but their scanners are some of the
best, so we should definitly have discoverable support for them, which
this patch hopefully adds.

Inspiration was taken from the following sources:
https://www.josharcher.uk/code/install-scansnap-s1300-drivers-linux/
https://ubuntuforums.org/archive/index.php/t-1461915.html
https://github.com/stevleibelt/scansnap-firmware
2021-08-01 13:45:46 +02:00
Jörg Thalheim 9254bf3607
Merge pull request #131312 from Lassulus/vbox-size
vbox-image: add new option to set free space in image
2021-08-01 10:07:35 +01:00
Ben Siraphob 44db812a14
Merge pull request #132257 from Zopieux/simple-mpv-webui
mpvScripts.simple-mpv-webui: 1.0.0 -> 2.1.0
2021-08-01 12:10:12 +07:00
Aaron Andersen 404cd360c2
Merge pull request #129468 from jwygoda/litestream-service
nixos/litestream: init
2021-07-31 22:58:48 -04:00
Aaron Andersen 099015b2ed
Merge pull request #116578 from MatthewCroughan/node-red-service
nixos/node-red: add module
2021-07-31 22:57:26 -04:00
Alexandre Macabies c9e991bd64 mpvScripts.simple-mpv-webui: 1.0.0 -> 2.1.0
This also adds a test. The current packaged version (1.0.0) is broken,
it cannot find relevant files.
2021-08-01 00:47:55 +02:00
Guillaume Girol 0a505c3682
Merge pull request #128141 from milogert/tt-rss-2021-06-21
tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss: updated config.php creation
2021-07-31 15:36:23 +00:00
Guillaume Girol 256af6b742
nixos/tt-rss: fix eval 2021-07-31 15:19:00 +00:00
Jörg Thalheim 4dba1b99ec
Merge pull request #131102 from helsinki-systems/feat/rework-etc-2
nixos/etc: Replace make-etc.sh with nix and bash
2021-07-31 03:57:59 +01:00
Martin Weinelt b3b187315b
Merge pull request #131885 from mweinelt/kea 2021-07-31 02:21:19 +02:00
Artturin bd8eeec9c0 {uptimed,nixos/uptimed}: switch to /var/lib/ and fix perms 2021-07-31 01:05:44 +03:00
Janne Heß eb7120dc79
nixos/etc: Replace make-etc.sh with nix and bash
The main goal of this commit is to replace the rather fragile passing of
multiple arrays which could break in cases like #130935.
While I could have just added proper shell escaping to the variables
being passed, I opted for the more painful approach of replacing the
fragile and somewhat strange construct with the 5 bash lists. While
there are currently no more problems present with the current approach
(at least none that I know of), the new approach seems more solid and
might get around problems that could arise in the future stemming from
either the multiple-lists situation or from the absence of proper shell
quoting all over the script.
2021-07-30 21:33:13 +02:00
Jarosław Wygoda 1dcfd1e329 nixos/litestream: init 2021-07-30 17:41:54 +02:00
Martin Weinelt 3d43cf8f21
nixos/kea: fix config reload
Because the config file gets symlinked to /etc/kea to make reloads work
we need to add restart triggers for the actual symlink targets.
2021-07-30 03:25:11 +02:00
Martin Weinelt d902365913
nixos/bird: fix bird/bird6 description 2021-07-30 03:13:50 +02:00
Peter Ferenczy 3936313b1f nixos/firewall: document log location
Motivated by not finding the firewall log messages for an annoyingly long time.
2021-07-29 18:43:50 +02:00
Pavol Rusnak d2e468a571
nixos/version: make versions in /etc/os-release less verbose
Fixes #127654; also see details in there.
2021-07-29 17:26:31 +02:00
Lassulus 729042fae8
Merge pull request #131794 from ncfavier/syncthing-collapse-declarative
nixos/syncthing: move declarative options to the top level
2021-07-29 15:42:33 +02:00
Naïm Favier f114215b14
nixos/syncthing: clean up option descriptions 2021-07-29 15:20:30 +02:00
Niklas Hambüchen 82272021e2
Merge pull request #128886 from scvalex/coredns-configurable-corefile
kubernetes.addons.dns: make corefile configurable
2021-07-29 14:31:19 +02:00
Frederik Rietdijk 3888701716
Merge pull request #131345 from NixOS/staging-next
Staging next
2021-07-29 10:45:20 +02:00
Jacek Galowicz fae7252ec5
Merge pull request #131754 from blaggacao/fix-testing-invalid-node-names
nixos/testing: fix invalid node names detection
2021-07-29 09:47:19 +02:00
Milo Gertjejansen f3b660014d
Merge branch 'master' into tt-rss-2021-06-21 2021-07-28 21:06:44 -04:00
Milo Gertjejansen 7aa2bf302a Added more detail to changelog, updated permissions in directory, and changed restartTriggers 2021-07-28 20:53:38 -04:00
github-actions[bot] 4fc7a31edb
Merge master into staging-next 2021-07-29 00:01:33 +00:00
Sandro fb525f4486
Merge pull request #129749 from GovanifY/discord-service
nixos/mx-puppet-discord: add module
2021-07-28 21:59:30 +00:00
Gauvain 'GovanifY' Roussel-Tarbouriech 040129fa31
nixos/mx-puppet-discord: add module 2021-07-28 23:30:24 +02:00
Eelco Dolstra 512ee6db39
nix-fallback-paths.nix: Update to 2.3.15 2021-07-28 22:45:33 +02:00
David Arnold dc060ff8b2
nixos/testing: fix invalid node names detection
the use of python further restricts possible RFC1035 host labels since
dash is not allowed for use in python identifiers.

The previous implementation of this check was flawed, since it did not
check the `hostName` value that is actually used to construe the
identifier, but the node name, which can be anything, e.g. just `machine`.

The previous implementation, by further restricting RFC1035 labels, only
for the sake of testing seems to be an unacceptable restriction and should
be addressed separately.
2021-07-28 15:37:57 -05:00
Robert Hensing 60e0f94d3a
Merge pull request #131760 from blaggacao/fix-installer-root-fs-type-override
nixos/installer: force root fs type
2021-07-28 22:24:04 +02:00
David Arnold c219fdffad
nixos/installer: force root fs type
installer media can be used on top of existing host configs. In such
scenarions, root fs types will already be defined.

Before this change, this will inevitably lead to the following error:
```console
error: The option `fileSystems./.fsType' has conflicting definition values:
       - In `/nix/store/2nl5cl4mf6vnldpbxhrbzfh0n8rsv9fm-source/DevOS/os/hardware/common.nix': "ext4"
       - In `/nix/store/jbch90yqx6gg1h3fq30jjj2b6h6jfjgs-source/nixos/modules/installer/cd-dvd/iso-image.nix': "tmpfs"
```

With this patch, the installers will override those values according to
their own local requirement.

Use `mkOverride 60` so that conscientious overriding specially targeted
at the installer, e.g. with `mkForce` is still straight forward.
2021-07-28 15:05:25 -05:00
Alexandru Scvortov ed62c1c663 kubernetes: make corefile configurable 2021-07-28 20:15:57 +01:00
github-actions[bot] 6fcda9f1ec
Merge master into staging-next 2021-07-28 18:01:16 +00:00
Franz Pletz 8f40f574f8
Merge pull request #131578 from mweinelt/influxdb-exporter
prometheus-influxdb-exporter: init at 0.8.0
2021-07-28 19:47:06 +02:00
matthewcroughan b9c9d52aec nixos/node-red: add test 2021-07-28 17:32:45 +01:00
matthewcroughan badbbb7e05 nixos/node-red: add module
Adds a basic nixos module/service for node-red based on nodePackages.node-red

Co-authored-by: Aaron Andersen <aaron@fosslib.net>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored by: Adrian Parvin Ouano <adrianparvino@gmail.com>
Co-authored-by: Norbert Melzer <nmelzer@nobbz.dev>
2021-07-28 17:30:57 +01:00
github-actions[bot] a1d3be1d42
Merge master into staging-next 2021-07-28 12:01:16 +00:00
Sandro ebb592a04c
Merge pull request #131694 from scvalex/enable-kubernetes-passthru-tests
kubernetes: enable passthru tests
2021-07-28 11:14:35 +00:00
Alexandru Scvortov b9acd426df kubernetes: add passthru tests
Also defensively quote a path and reformat a comment to trigger the
right review.
2021-07-28 11:27:22 +01:00
Naïm Favier e9b01c5c8e
nixos/syncthing: move declarative options to the top level 2021-07-28 11:30:30 +02:00
Lassulus a66d9f9b00
Merge pull request #131737 from ncfavier/syncthing-extraOptions
nixos/syncthing: add declarative.extraOptions
2021-07-28 11:12:29 +02:00