3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

26619 commits

Author SHA1 Message Date
github-actions[bot] ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
ajs124 397f065cb4 nixos/tasks/lvm: add vdo support 2022-04-04 13:00:46 +01:00
Janne Heß 75ece4eb82
nixos/stage-1-systemd: Limit files to the bare necessities 2022-04-04 12:54:18 +01:00
Janne Heß 4b9efea255
nixos/stage-1-systemd: Implement job scripts 2022-04-04 11:44:31 +01:00
Bjørn Forsman 966953354c nixos/ethminer: fix option types for maxPower, recheckInterval
Neither power nor time intervals can be negative, let's use unsigned
int.
2022-04-04 11:50:24 +02:00
Bjørn Forsman 5e38d36a6b nixos/ethminer: only pull in cudatoolkit when needed 2022-04-04 11:50:24 +02:00
Timo Kaufmann b44f7ed2c2
Merge pull request #166250 from gador/pgadmin-update-6.7
pgadimin4: 6.5 -> 6.7
2022-04-04 10:07:08 +02:00
github-actions[bot] 493d6516dd
Merge master into haskell-updates 2022-04-04 00:11:26 +00:00
Martin Weinelt bb7e4b378e Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 00:46:44 +02:00
Martin Weinelt bc4b9eef3c
Merge pull request #167061 from Artturin/fixtestevalhib 2022-04-03 20:54:34 +02:00
Janne Heß 95a0726449
Merge pull request #167048 from helsinki-systems/fix/test-boot-cdrom
nixos/tests/boot: fix after aa0f27abb0
2022-04-03 20:52:04 +02:00
Artturin 65725c1637 nixos/tests/hibernate: fix eval
by removing duplicate `nodes`
2022-04-03 21:35:05 +03:00
Janne Heß 56b4653904
nixos/stage-2-init: Re-add creation of /etc 2022-04-03 19:03:16 +01:00
github-actions[bot] c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Lassulus f465a5cdf8
Merge pull request #137335 from dsg22/feature-jupyter-create-system-user
jupyter: Create jupyter user as system user
2022-04-03 18:22:04 +01:00
Michael Weiss a378300562
Merge pull request #136040 from xaverdh/adb-open
nixos/adb: switch to android-tools built from source
2022-04-03 18:56:49 +02:00
Martin Weinelt eb40e8633a
Merge pull request #167027 from helsinki-systems/drop/broken 2022-04-03 18:29:26 +02:00
ajs124 4e9f1e537e nixos/tests/boot: fix after aa0f27abb0 2022-04-03 17:24:05 +01:00
Guillaume Girol aafec3d778
Merge pull request #166154 from YoshiRulz/yoshi-manual
Manual: move note re: `useOSProber` option under GRUB subheading
2022-04-03 16:17:48 +00:00
Matthieu Coudron 84fd282788 doc: mention the new format expected by the new vim updater
e.g., from simple strings to csv
2022-04-03 18:14:14 +02:00
Guillaume Girol 23bcd51fd5
Merge pull request #161075 from symphorien/collectd-interval
nixos/collectd: put extraconfig before plugins
2022-04-03 15:59:49 +00:00
Martin Weinelt f2a00b4079
Merge pull request #163658 from dminuoso/kea-changes 2022-04-03 17:44:19 +02:00
Victor Nawothnig 799bda94db nixos/kea: Allow specifying custom config file 2022-04-03 17:34:00 +02:00
Guillaume Girol 44a3d91e5f nixos/collectd: put extraconfig before plugins
this is necessary to override the global option Interval.
If set after the plugins, it has no effect.
2022-04-03 17:25:26 +02:00
ajs124 eb13e249f0 openfire: remove after being marked broken for over two years
It was marked in commit 567c1a360f by Michael Raskin on 2017-01-04 (commited on 2017-01-04)
2022-04-03 16:14:18 +01:00
Guillaume Girol f9fe536c8f
Merge pull request #165873 from symphorien/rkjnsn-master
xfce4-screensaver: init at 4.16.0
2022-04-03 15:09:08 +00:00
Janne Heß 371504ac8e
Merge pull request #167019 from NixOS/fix/systemd-env
nixos/stage-2-init: Don't clear environment
2022-04-03 16:36:26 +02:00
Janne Heß 7cdc4dd5d1
Merge pull request #164943 from ElvishJerricco/systemd-initrd-reuse-systemd-module
initrd: Opt-in bare bones systemd-based initrd
2022-04-03 15:53:02 +02:00
sternenseemann 103d171526
Merge pull request #166548 from sternenseemann/fix-ghclibdir-computation
[haskell-updates] ghcWithPackages: fix ghclibdir computation with variantSuffix
2022-04-03 14:22:34 +02:00
Lassulus e65b825672
Merge pull request #165684 from helsinki-systems/clean/stage-2-init
nixos/stage-2-init: Clean up legacy commands
2022-04-03 14:12:52 +02:00
Janne Heß ea473fac72
nixos/stage-2-init: Don't clear environment
This breaks NixOS Containers because systemd needs some env variables
from the outside.
2022-04-03 11:12:00 +01:00
github-actions[bot] fc36f69a60
Merge master into staging-next 2022-04-03 00:02:50 +00:00
Peter Hoeg e38cc45dd1 nixos: add maestral tests 2022-04-03 03:37:22 +08:00
github-actions[bot] fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00
matthewcroughan 8f3181f672 nixos/tests/mtp: init
Adds a fully fledged NixOS VM integration test which uses jmtpfs and
gvfs to test the functionality of MTP inside of NixOS. It uses USB
device emulation in QEMU to create MTP device(s) which can be tested
against.
2022-04-02 18:28:02 +01:00
7c6f434c 8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
github-actions[bot] 66754ae952
Merge master into staging-next 2022-04-02 12:01:10 +00:00
Jan Solanti f665340b6c pipewire: 0.3.48 -> 0.3.49 2022-04-02 12:10:35 +02:00
github-actions[bot] fd5d77aa66
Merge master into staging-next 2022-04-02 06:01:21 +00:00
github-actions[bot] 8b4f11bb87
Merge master into staging-next 2022-04-02 00:02:09 +00:00
Florian Klink c57c5c42a4 prometheus-bird-exporter: update birdSocket default path
a5276e1fbd updated bird to use
/run/bird/bird.ctl, but didn't update the default used for
prometheus-bird-exporter.

Reported-In: https://github.com/NixOS/nixpkgs/pull/161193#issuecomment-1086228985
2022-04-01 22:59:48 +02:00
Florian Klink 401cb86da1
Merge pull request #166142 from ncfavier/wait-online
nixos/networkd: add `wait-online` options
2022-04-01 22:54:28 +02:00
Zhaofeng Li e42f06f93f nixos/podman: Add zfs to wrapper if enabled 2022-04-02 06:38:16 +10:00
Jeppe Fihl-Pearson b5f36e84d1 Add block size to dd command
Without configuring the block size a default of 512 bytes is used, which can
slow down the transfer speed massively.

In a test I've done with a semi-decent USB stick, I only get a transfer speed
of around 180 KB/sec when not specifying the block size but see 27 MB/sec when
setting the block size to 1 MB. This makes the transfer of the minimal
installation ISO take half a minute instead of an hour.
2022-04-01 22:14:04 +02:00
P. R. d. O eeb3206a29 nixos/jenkinsSlave: install java
Installs Java into the Jenkins agent and allows specifying the JDK/JRE package to use. This is necessary as Jenkins verifies if the agent contains Java installed through the java -fullversion command, which if not, the connection will fail.
2022-04-01 22:11:18 +02:00
github-actions[bot] 27e49cc5a4
Merge master into staging-next 2022-04-01 18:01:22 +00:00
Robert Hensing 0b1a2907d6
Merge pull request #166044 from hercules-ci/java-properties
Add `formats.javaProperties`
2022-04-01 19:05:33 +02:00
pennae cc1d86d759
Merge pull request #166822 from WolfangAukang/sslmate-agent-fix
nixos/sslmate-agent: add to module-list
2022-04-01 17:04:03 +00:00
Bobby Rong 3c583c8226
Merge pull request #166569: unbreak GNOME Flashback and reintroduce gnome-bluetooth_1_0
- Add missing geocode-glib dependency for gnome-panel
- Reintroduce gnome-bluetooth_1_0 for gnome-flashback, blueberry and gnome-bluetooth-contract

Related:
- https://gitlab.gnome.org/GNOME/gnome-panel/-/merge_requests/49
- https://github.com/NixOS/nixpkgs/pull/166569#issuecomment-1084658550
- https://github.com/linuxmint/blueberry/issues/123
- https://github.com/elementary/gnome-bluetooth-contract/issues/1
2022-04-01 23:50:36 +08:00
P. R. d. O cf6af1933b
nixos/sslmate-agent: add to module-list 2022-04-01 07:23:45 -06:00
Robert Hensing 28a227a890 formats.javaProperties: Add documentation 2022-04-01 15:19:45 +02:00
github-actions[bot] 50497647fa
Merge master into staging-next 2022-04-01 12:01:21 +00:00
Janne Heß 7ebb4ebe40
nixos/systemd-stage-1: Append (Initrd) to /etc/initrd-release
This is more in line with what dracut does (it appends "Initramfs") and
makes it clear where the boot is currently at when it hangs.
2022-04-01 13:54:09 +02:00
Aaron Andersen fc5df319cf
Merge pull request #165764 from notgne2/oauth2-proxy-group
nixos/oauth2_proxy: add user group
2022-04-01 13:32:21 +02:00
Janne Heß 5653209ed9
nixos/systemd-initrd: Redo object specifications
As requested by @roberth, we now have an option similar to
environment.etc. There's also extra store paths to copy and a way to
suppress store paths to make customizations possible.

We also link mount and umount to /bin to make recovery easier when
something fails
2022-04-01 13:26:06 +02:00
talyz dd2cab2b50
keycloak: 16.1.0 -> 17.0.1 2022-04-01 12:39:10 +02:00
Janne Heß c465c8d719
nixos/systemd-initrd: Make emergency access more flexible 2022-04-01 11:58:31 +02:00
Janne Heß b7c62b8238
nixos/systemd-initrd: Remove unit options that don't work 2022-04-01 11:58:30 +02:00
Janne Heß 1e5261f31c
nixos/systemd-lib: Use module composition 2022-04-01 09:57:19 +02:00
github-actions[bot] 5e1c018e60
Merge master into staging-next 2022-04-01 06:01:23 +00:00
Artturi c7ac6ff789
Merge pull request #162063 from martinetd/logrotate_size
logrotate: update to freeform
2022-04-01 06:21:11 +03:00
Silvan Mosberger fda16bfd32
Merge pull request #165532 from Infinisil/syncplay-password 2022-04-01 04:37:22 +02:00
github-actions[bot] 1652173e67
Merge master into staging-next 2022-04-01 00:02:15 +00:00
Dominique Martinet 829c611b48 logrotate: add logrotate-checkconf.service
the build-time check is not safe (e.g. doesn't protect from bad users or nomissingok
paths missing), so add a new unit for configuration switch time check
2022-04-01 07:09:27 +09:00
Dominique Martinet b0a04e4105 nginx/logrotate: run logrotate as nginx user 2022-04-01 07:09:27 +09:00
Dominique Martinet 45ef5c1741 logrotate: add configuration check at build time
Now the service no longer starts immediately,
check if the config we generated makes sense as soon as possible.

The check isn't perfect because logrotate --debug wants to check
users required, there are two problems:
 - /etc/passwd and /etc/group are sandboxed and we don't have
visibility of system users
 - the check phase runs as nixbld which cannot su to other users
and logrotate fails on this

Until these two problems can be addressed, users-related checks
are filtered out, it's still much better than no check.
The check can be disabled with services.logrotate.checkConfig
if required
(bird also has a preCheck param, to prepare the environment
before check, but we can add it if it becomes necessary)

Since this makes for very verbose builds, we only show errors:
There is no way to control log level, but logrotate hardcodes
'error:' at common log level, so we can use grep, taking care
to keep error codes

Some manual tests:
───────┬──────────────────────────────────────────
       │ File: valid-config.conf
───────┼──────────────────────────────────────────
   1   │ missingok
───────┴──────────────────────────────────────────
logrotate --debug ok
grep ok

───────┬──────────────────────────────────────────
       │ File: postrotate-no-end.conf
───────┼──────────────────────────────────────────
   1   │ missingok
   2   │ /file {
   3   │    postrotate
   4   │      test
   5   │ }
───────┴──────────────────────────────────────────
error: postrotate-no-end.conf:prerotate, postrotate or preremove without endscript

───────┬──────────────────────────────────────────
       │ File: missing-file.conf
───────┼──────────────────────────────────────────
   1   │ "test" { daily }
───────┴──────────────────────────────────────────
error: stat of test failed: No such file or directory

───────┬──────────────────────────────────────────
       │ File: unknown-option.conf
───────┼──────────────────────────────────────────
   1   │ some syntax error
───────┴──────────────────────────────────────────
logrotate --debug ok
error: unknown-option.conf:1 unknown option 'some' -- ignoring line

───────┬──────────────────────────────────────────
       │ File: unknown-user.conf
───────┼──────────────────────────────────────────
   1   │ su notauser notagroup
───────┴──────────────────────────────────────────
error: unknown-user.conf:1 unknown user 'notauser'

In particular note that logrotate would not error on unknown option
(it just ignores the line) but this change makes the check fail.
2022-04-01 07:09:27 +09:00
Dominique Martinet e92c05349c nixos/logrotate: convert to freeform
using freeform is the new standard way of using modules and should replace
extraConfig.
In particular, this will allow us to place a condition on mails
2022-04-01 07:09:26 +09:00
Dominique Martinet 3cc8ea28d1 logrotate: add services.logrotate.configFile escape hatch 2022-04-01 07:09:26 +09:00
Dominique Martinet 3a2fa0d049 logrotate: run through nixpkgs-fmt
Running once now will make further patches formatting easier
2022-04-01 07:09:26 +09:00
Dominique Martinet b457d917dc logrotate: move mail dependency from package to service
having pkgs.logrotate depend on mailutils brings in quite a bit of dependencies
through mailutil itself and recursive dependency to guile when most people
do not need it.

Remove mailutils dependency from the package, and conditionally add it to the
service if the user specify the mail option either at top level or in a path

Fixes #162001
2022-04-01 07:09:24 +09:00
Yaya 8465654f6a nixos/tests/gitlab: Add yayayayaka to maintainers 2022-03-31 21:56:18 +02:00
Yaya 35251c637b nixos/tests/gitlab: Check HTTP response codes
cURL always exits with `0` even when the HTTP response codes are above
400, leading to false-positive test results.
2022-03-31 21:56:18 +02:00
Yaya 86ec4e306e nixos/tests/gitlab: Fix project id
Gitlab automatically creates a repository, taking away the project
id=1.
2022-03-31 21:56:18 +02:00
Yaya 28068cebc9 nixos/tests/gitlab: Fix Authorization Bearer field
Due to an incorrect shell escape the Authorization Bearer Token was not
present in the cURL request headers.
2022-03-31 21:56:18 +02:00
github-actions[bot] be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00
Robert Hensing 60554e4686
Merge pull request #166578 from Enzime/nix-run-vm
nixos/qemu-vm: Set `mainProgram` for `nix run`
2022-03-31 19:00:38 +02:00
Martin Weinelt 3344cea254
Merge pull request #164627 from mkg20001/fix-matrix 2022-03-31 18:26:03 +02:00
pennae 3807bedb36
Merge pull request #166338 from cole-h/1p
nixos/_1password{,-gui}: cleanup
2022-03-31 15:36:40 +00:00
Bobby Rong 7ce8bc5d48
pantheon.gnome-bluetooth-contract: use gnome-bluetooth_1_0 2022-03-31 23:32:29 +08:00
Silvan Mosberger 2da8e63ce8
Merge pull request #111595 from Luflosi/add-cherry-usb-kb-kernel-module
nixos/availableKernelModules: add cherry hid
2022-03-31 17:14:29 +02:00
Martin Weinelt e80642bdcb
Merge pull request #165772 from alarsyo/paperless-ng-mail-fix 2022-03-31 16:52:06 +02:00
Michael Hoang 2c102d19c0 nixos/qemu-vm: Set mainProgram for nix run 2022-04-01 01:34:26 +11:00
Janne Heß 5b09ceff27
Merge pull request #166563 from K900/wireplumber-derp
nixos/wireplumber: fix Lua syntax
2022-03-31 14:46:31 +02:00
Robert Hensing 16c5f5534d
Merge pull request #165035 from roberth/nixosTest-remove-machine-arg
nixosTest: remove `machine` syntax sugar
2022-03-31 14:41:05 +02:00
Sandro 9b074b8ee9
Merge pull request #166526 from witchof0x20/some_docs_fixes 2022-03-31 14:12:02 +02:00
K900 9febd97f98 nixos/wireplumber: fix Lua syntax 2022-03-31 15:11:15 +03:00
Erik Jensen e0d0ff64b2 xfce4-screensaver: init at 4.16.0
A simple screen saver and locker for the Xfce desktop environment.
2022-03-31 12:00:00 +00:00
Alyssa Ross ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Kerstin Humm f44b12fb52 mastodon: use correct GitHub Url
The tootsuite organization was renamed to mastodon ages ago.
2022-03-31 13:17:11 +02:00
Kerstin Humm 23a1971a4e nixos/mastodon: preload libjemalloc.so
Co-authored-by: Izorkin <izorkin@elven.pw>
2022-03-31 13:17:11 +02:00
sternenseemann 6016ed5076 treewide: replace uses of ghc.name to find packages' datadir 2022-03-31 12:53:40 +02:00
madisetti 9dddd48c4c nixos/grub: added configuration option for entry options 2022-03-31 06:39:16 -04:00
Jade e50bc2f36d
nixos/nix-gc, nixos/auto-upgrade: Minor documentation fixes.
The gc documentation had some artifacts (presumably being copied from
autoupgrade) and the autoupgrade docs had a typo
2022-03-31 00:24:25 -04:00
Martin Weinelt d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Matthew Toohey a0f7d98c19 nixos/jitsi-meet: fix typo 2022-03-30 20:56:29 -04:00
ajs124 35619ce1e5
Merge pull request #165453 from helsinki-systems/feat/systemd-manager-environment
nixos/systemd: Switch to ManagerEnvironment=
2022-03-31 01:35:09 +02:00
ajs124 ae2ad5ee80
Merge pull request #166487 from mweinelt/pgadmin3
pgadmin3: drop
2022-03-31 00:57:33 +02:00
ajs124 9a20d75689
Merge pull request #166442 from mweinelt/botamusique
botamusique: use nodejs-14_x
2022-03-31 00:47:50 +02:00
Janne Heß d1e1ba036e
Merge pull request #164570 from helsinki-systems/upd/manual-copyright
nixos/manual: Update copyright years
2022-03-31 00:08:18 +02:00
Martin Weinelt 9bb92e48ef
pgadmin3: drop
The package version is 6y old and was last maintained in 2017. By now we
have pgadmin4 packaged so there is no reason to keep this around.
2022-03-30 23:44:18 +02:00