3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

26692 commits

Author SHA1 Message Date
sternenseemann fb2fc3b4a4 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-05 21:21:42 +02:00
Jonathan Ringer f8002a6687
nixos/qtile: expose package option 2022-04-05 12:11:27 -07:00
Vladimír Čunát b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Frederik Rietdijk 0e141f0382 nixos tests atop: don't allow unfree packages
We are not supposed to enable the use of unfree packages in Nixpkgs.
2022-04-05 20:06:24 +02:00
Robert Hensing 559ac3c9e7
Merge pull request #166383 from hercules-ci/always-sanitize-derivation-name
Always sanitize derivation name
2022-04-05 20:05:33 +02:00
github-actions[bot] 29bffe5afe
Merge staging-next into staging 2022-04-05 18:02:16 +00:00
Jonathan Ringer c2828e8479
nixos/qtile: expose unwrapped package to systemPackages 2022-04-05 10:43:15 -07:00
Robert Hensing 39e0bd705b
Merge pull request #165259 from Luflosi/ipfs-recursiveUpdate
nixos/ipfs: use lib.recursiveUpdate instead of // operator
2022-04-05 19:16:39 +02:00
Vladimír Čunát 6427998d85
nixosTests.installer.*: provide a missing dependency
See errors in these three jobs:
https://hydra.nixos.org/eval/1753111#tabs-still-fail
It's a bit unpleasant that a single run of each test takes
almost an hour for me (half an hour on Hydra in some cases).
2022-04-05 18:55:56 +02:00
Silvan Mosberger 25de2935ef lib/modules: Document _module.args
Documents the _module.args option, motivated by many usages in Flakes,
especially with the deprecation of extraArgs
(78ada83361)

The documentation rendering for this option had to be handled a bit
specially, since it's not declared in nixos/modules like all the other
NixOS options.

Co-Authored-By: pennae <github@quasiparticle.net>
Co-Authored-By: Robert Hensing <robert@roberthensing.nl>
2022-04-05 18:26:40 +02:00
Silvan Mosberger ce6bb9800d
Merge pull request #164800 from pennae/ssh-knownhosts-hostnames
nixos/ssh: undeprecate knownHosts.«name».hostNames
2022-04-05 18:05:26 +02:00
github-actions[bot] 3063a8ea39
Merge staging-next into staging 2022-04-05 12:10:46 +00:00
7c6f434c e2fd601514
Merge pull request #154981 from helsinki-systems/feat/lvm2-vdo
(k)vdo: init
2022-04-05 12:06:48 +00:00
github-actions[bot] 27a4e52731
Merge master into staging-next 2022-04-05 12:05:41 +00:00
ajs124 41c440bebe
Merge pull request #167315 from Lassulus/systemd-disk-image
make-disk-image: add systemdMinimal to PATH
2022-04-05 13:17:55 +02:00
ajs124 4b3ebfb126 nixos/tests/lvm2: add comment recommending a test 2022-04-05 11:46:09 +01:00
Alyssa Ross f4a0bb8334
nixos/mailman: improve empty webHosts error
Now this configuration mistake will generate the assertion message,
instead of "error: list index 0 is out of bounds".
2022-04-05 10:18:57 +00:00
ajs124 bfa9a7eb22
Merge pull request #167270 from ryantm/vaultwarden-test
nixos/vaultwarden: fix test
2022-04-05 12:15:40 +02:00
lassulus ed18db011f make-disk-image: add systemdMinimal to PATH
this is needed to setup /tmp inside the chroot. which is needed by
systemd-boot to sucessfully install
2022-04-05 11:57:53 +02:00
Max Hausch a2465483e8
nixos/lib/qemu-common: Opportunistically use KVM
This will try to use KVM if available and fallback to using TCG if not.
Useful for nested virtualisation of arm on x86.
2022-04-05 11:49:42 +02:00
Lassulus b69bd66518
Merge pull request #167242 from helsinki-systems/feat/systemd-stage-1-variable-bin
nixos/systemd-stage-1: Softcode bin tools...
2022-04-05 09:39:19 +01:00
Robert Hensing 7dabcdbcf4
Merge pull request #167287 from qowoz/dockertools
dockerTools: various
2022-04-05 09:42:26 +02:00
Matthieu Coudron d396c7d316
Merge pull request #166941 from teto/vim-plugins-toml 2022-04-05 09:33:40 +02:00
Ryan Mulligan 0555c738b5 nixos/vaultwarden: fix test
The accept policies checkbox is no longer present on the user creation
screen.
2022-04-04 20:29:09 -07:00
Martin Weinelt bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
zowoq 76636e0099 dockerTools: pkgs.system -> pkgs.stdenv.hostPlatform.system
`pkgs.system` is an alias
2022-04-05 10:19:40 +10:00
github-actions[bot] 789aea7658
Merge master into haskell-updates 2022-04-05 00:11:09 +00:00
Janne Heß acf089edef
nixos/systemd-stage-1: Softcode bin tools...
...and other cleanups and fixes
2022-04-04 22:56:31 +01:00
github-actions[bot] 5844b1c2fa
Merge master into staging-next 2022-04-04 18:01:27 +00:00
Bernardo Meurer 974ce2dffa
Merge pull request #167209 from bjornfor/ethminer-remove-unneeded-nvidia-dep
nixos/ethminer: only pull in nvidia_x11 when needed
2022-04-04 10:46:44 -07:00
Bjørn Forsman c1af79c69d nixos/ethminer: only pull in nvidia_x11 when needed
Only people using CUDA need it.
2022-04-04 19:27:20 +02:00
Lassulus 5083d22ec5
Merge pull request #167167 from helsinki-systems/feat/systemd-stage-1-less-systemd-files
nixos/stage-1-systemd: Limit files to the bare necessities
2022-04-04 18:25:55 +01:00
Janne Heß 41d3ca0677
nixos/systemd-stage-1: Use an own systemd package
We need more features than systemdMinimal but less than systemd so we
need some own packages :/
2022-04-04 18:12:45 +01:00
Martin Weinelt c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
ajs124 c532fcdd96 nixos/tests/lvm2/vdo: fix machine name 2022-04-04 14:29:20 +01:00
ajs124 6bbba30674 nixos/tests/lvm2: init 2022-04-04 14:25:39 +01:00
ajs124 6a8face381 nixos/tests/lvm2: don't try to add script from vdo to initrd 2022-04-04 14:23:09 +01:00
Lassulus 33a73886c4
Merge pull request #167153 from helsinki-systems/feat/systemd-stage-1-jobscripts
nixos/stage-1-systemd: Implement job scripts
2022-04-04 14:15:22 +01:00
Janne Heß beb02229fb
nixos/systemd-unit-options: Fix indentation 2022-04-04 13:53:58 +01:00
Robert Hensing dd0d10bbb6
Merge pull request #165583 from bosu/patch-1
nixos/qemu-vm: allow booting VM with the custom kernel
2022-04-04 14:33:35 +02:00
github-actions[bot] 17eb9da14b
Merge staging-next into staging 2022-04-04 12:06:26 +00:00
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
Martin Weinelt dc08c7d7ea
Merge pull request #164511 from helsinki-systems/refactor/nss-latest-esr 2022-04-04 03:48:19 +02:00
github-actions[bot] 493d6516dd
Merge master into haskell-updates 2022-04-04 00:11:26 +00:00
github-actions[bot] c9154e5e14
Merge staging-next into staging 2022-04-04 00:02:45 +00:00
Martin Weinelt bb7e4b378e Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 00:46:44 +02:00
Martin Weinelt f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
Jan Tojnar 84d6565d52 nixos/man: prevent duplication of options
libxslt 1.1.35 fixed conflict resolution for templates to match the specification.
This uncovered a bug in docbook-xsl (https://github.com/docbook/xslt10-stylesheets/issues/240),
which causes option names to be duplicated into the option descriptions.

Let’s resolve the conflict by patching the stylesheets.

Fixes: https://github.com/NixOS/nixpkgs/issues/166304
2022-04-03 21:22:47 +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
ajs124 6f92fcbcbe nss: add esr and latest change release-notes entry 2022-04-03 16:13:36 +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
Artturin 4d49c7e6d8 nixos/udisks2: add freeform settings 2022-04-03 09:40:53 +03:00
github-actions[bot] fa7a0dbb82
Merge staging-next into staging 2022-04-03 00:03:35 +00: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] ffa96ab0c0
Merge staging-next into staging 2022-04-02 18:01:37 +00: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
Alyssa Ross 8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00: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