3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

31455 commits

Author SHA1 Message Date
github-actions[bot] 872d17dee8
Merge master into staging-next 2023-01-30 18:01:30 +00:00
K900 2c257a212e
Merge pull request #213509 from K900/accept-my-fate
treewide: add myself as maintainer to all the Pipewire stuff
2023-01-30 20:05:49 +03:00
Artturi d88425e91c
Merge pull request #199512 from 06kellyjac/tracee 2023-01-30 17:59:23 +02:00
Vladimír Čunát 23ce77d76e Revert #178290: nixos/virtualisation: add option
...for explicitly named network interfaces

This reverts commit 6ae3e7695e.
(and evaluation fixups 08d26bbb72 7aed90a969)
Some of the tests fail or time out after the merge.
2023-01-30 07:55:50 -08:00
06kellyjac 22ebaedc73 tracee: 0.9.2 -> 0.10.0
Diff: https://github.com/aquasecurity/tracee/compare/v0.9.2...v0.10.0

Changelog: https://github.com/aquasecurity/tracee/releases/tag/v0.10.0

Fix integration tests after recent changes
2023-01-30 15:22:50 +00:00
Michele Guerini Rocco 72c6c848ee
Merge pull request #212685 from rnhmjoj/pr-connman
nixos/wireless: fix failure on missing config file
2023-01-30 13:32:58 +01:00
github-actions[bot] 1a06f52c21
Merge master into staging-next 2023-01-30 12:01:22 +00:00
Sandro d26c778ade
Merge pull request #153127 from eyJhb/user-uids-fix
nixos/users+nixos/lightdm: fixed users starting at 1000, and system users below 1000
2023-01-30 11:32:10 +01:00
rnhmjoj fc211deccf
nixos/tests/connman: init 2023-01-30 07:48:51 +01:00
Nick Cao 445d1dc7b0
Merge pull request #213483 from lovesegfault/fix-roon-bridge
nixos/roon-bridge: fix exec name
2023-01-30 14:25:25 +08:00
K900 ffaae97867 nixos/pipewire: add myself as maintainer 2023-01-30 09:09:47 +03:00
Bernardo Meurer 259cc7903c
nixos/roon-bridge: fix exec name 2023-01-29 19:57:59 -05:00
github-actions[bot] 7b3f0537af
Merge master into staging-next 2023-01-29 18:01:12 +00:00
Raphael Robatsch 7aed90a969 nixos/tests/networking: fix evaluation
Fixes commands such as `nix-build -A nixosTests.networking.scripted`.
Currently this fails: "error: The option `nodes' is used but not
defined."
2023-01-29 14:30:29 +01:00
github-actions[bot] 2019d6632b
Merge master into staging-next 2023-01-29 12:01:20 +00:00
Florian b9e6189341
Octoprint vcgencmd patch (#213201)
* octoprint: add tmpfile.d rule for read-access to /dev/vchiq for vcgencmd

fixes #210629

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>

* Update pkgs/applications/misc/octoprint/default.nix

---------

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Nick Cao <nickcao@nichi.co>
2023-01-29 16:11:48 +08:00
K900 de6e502f5e pipewire: 0.3.64 -> 0.3.65 2023-01-29 10:11:12 +03:00
github-actions[bot] 04f965695c
Merge master into staging-next 2023-01-29 06:01:23 +00:00
Florian Brandes 5b3ce4f78f octoprint: add nixosTests
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
Co-authored-by: Nick Cao <nickcao@nichi.co>
2023-01-29 05:40:28 +01:00
github-actions[bot] d7f991bb53
Merge master into staging-next 2023-01-29 00:02:27 +00:00
Artturi 4cbf8b05bf
Merge pull request #213118 from vcunat/p/hotfix-networking-tests-eval 2023-01-28 22:10:51 +02:00
github-actions[bot] b460ba1998
Merge master into staging-next 2023-01-28 12:01:10 +00:00
Colin Arnott 64f3a304db
nixos/wordpress: ensure default sites includes a theme 2023-01-28 10:31:56 +00:00
Colin Arnott 1754920c76
wordpress: remove bundled plugins and themes
Wordpress bundles some non-essential plugins and themes, then pesters
users to upgrade them. As we make the whole webroot readonly, it is
not possible to trivially delete them. Instead we should have users
explicitly install plugins via the existing nixos module.
2023-01-28 10:17:21 +00:00
Jonas Heinrich 7a60b737d2
Merge pull request #210686 from urandom2/wordpress2
nixos/wordpress: plugins and themes as attrs
2023-01-28 11:07:53 +01:00
Jonas Heinrich ebf6fc346e
Merge pull request #212912 from urandom2/nextcloud
nextcloud26: init at 26.0.0beta1
2023-01-28 10:58:54 +01:00
Vladimír Čunát 08d26bbb72
nixos/tests/networking.nix: hotfix evaluation
It broke by merge 8803f1da6.
2023-01-28 09:34:11 +01:00
Martin Weinelt 52029b8e00 Merge remote-tracking branch 'origin/master' into staging-next 2023-01-27 23:50:36 +01:00
github-actions[bot] 8291dfb1b4
Merge master into staging-next 2023-01-27 18:01:31 +00:00
ckie 1859e56a7f
nixos/no-x-libs: don't mask self/super in nested override
From SuperSandro2000's post-merge review of the PR adding this,
nixos/no-x-libs: add qtbase. Sandro added a comment about this after I had
already merged it; self'/super' previously masked the top level self/super.
2023-01-27 19:24:59 +02:00
Jonas Heinrich 748c2b416c
nixos/wordpress: fix minor syntax error 2023-01-27 16:35:46 +01:00
Colin Arnott aefbc9623b
nextcloud26: init at 26.0.0beta1
Because nextcloud ships their prerelease versions on a different url, we
are not parsing the version string to detect which path to use. We also
enabled and validated this change via nixos module testing.
2023-01-27 15:28:41 +00:00
Colin Arnott 66e0e5ad74
nixos/wordpress: plugins and themes as attrs
In an effort to better encode version strings and use descriptive pnames
that do not conflict with top level pkgs, we currently use
wordpress-${type}-${pname} for pname. This is good for the nix store,
but when we synthesize the wordpress derivation in our module, we reuse
this pname for the output directory.

Internally wordpress can handle this fine, since plugins must register
via php, not directory. Unfortunately, many plugins like civicrm and
wpforms-lite are designed to rely upon the name of their install
directory for homing or discovery.

As such, we should follow both the upstream convention and
services.nextcloud.extraApps and use an attribute set for these options.
This allows us to not have to deal with the implementation details of
plugins and themes, which differ from official and third party, but also
give users the option to override the install location. The only issue
is that it breaks the current api.
2023-01-27 15:24:19 +00:00
Jörg Thalheim e80e3878b3
Merge pull request #178533 from Mic92/nixos-tests-shell
nixos/tests: extend shell_interact to accept alternative socat addresses
2023-01-27 12:24:08 +00:00
Jörg Thalheim 29db54c373 nixos/tests: extend shell_interact to accept alternative socat addresses
`shell_interact()` is currently not nice to use.  If you try to cancel
the socat process, it will also break the nixos test. Furthermore
ptpython creates it's own terminal that subprocesses are running in,
which breaks some of the terminal features of socat.
Hence this commit extends `shell_interact` to allow also to connect to
arbitrary servers i.e. tcp servers started by socat.
2023-01-27 13:09:25 +01:00
Vladimír Čunát 8a77ed60ac
Merge branch 'master' into staging-next 2023-01-27 09:36:55 +01:00
Jan Tojnar 42930c79dd nixos/fwupd: Upgrade ESP path config key
This setting was renamed and moved to the main config file in fwupd 1.8.5:
5d38e0aeea

Without this patch, fwupd tries to migrate the config and crashes when it meets the immutable:

    FuEngine             migrating OverrideESPMountPoint=/boot to EspLocation
    Failed to load daemon: failed to load engine: Failed to create file ?/etc/fwupd/daemon.conf.6HZBZ1?: Read-only file system

The setting was first introduced to the module in 08547ff642 to override the store paths set during build.5d38e0aeea
2023-01-27 00:54:17 +01:00
github-actions[bot] 578f1ba854
Merge master into staging-next 2023-01-26 18:01:29 +00:00
sternenseemann 4671a0d96b Merge remote-tracking branch 'origin/master' into haskell-updates 2023-01-26 16:18:50 +01:00
K900 c2182db406
Merge pull request #212440 from K900/fwupd-fix
nixos/fwupd: fix config parameter name
2023-01-26 17:27:10 +03:00
Nick Cao 124c0f3d27
Merge pull request #210477 from wineee/deepin-lib
deepin(library): init at 20.8
2023-01-26 21:56:17 +08:00
zowoq b93752ceb0 nixos/nix-fallback-paths: 2.12.0 -> 2.13.2 2023-01-26 22:54:25 +10:00
github-actions[bot] d7e7d75f99
Merge master into staging-next 2023-01-26 06:01:24 +00:00
Nick Cao 124946330f
Merge pull request #212541 from equirosa/tut-2.0.0
tut: 1.0.34 -> 2.0.0
2023-01-26 13:58:42 +08:00
Nick Cao 39b5d060cb
Merge pull request #212512 from NickCao/stratis
stratisd: 3.4.4 -> 3.5.0
2023-01-26 13:49:08 +08:00
github-actions[bot] 0f008a08f0
Merge master into haskell-updates 2023-01-26 00:13:32 +00:00
github-actions[bot] e91d2acb23
Merge master into staging-next 2023-01-26 00:02:34 +00:00
Robert Hensing d255493e8f nixos/optionsToDocbook.py: Add docbook ns for when the appendix tag is omitted 2023-01-26 00:32:56 +01:00
pennae 617822c95b nixos/manual: remove olinkdb
as far as we can tell nixos has only ever had a total of one olink, and
currently has no olinks at all. we can't currently represent olinks in
markdown docs, and if we re-add support for cross-document links they
will take a different form (and not use docbook, which will have to be
phased out before we re-add anything).

the olinkdb is thus unused and takes 10 seconds on our machine to build,
holding up the rest of the manual for no benefit.
2023-01-26 00:32:56 +01:00
pennae 0175a91aa3 nixos/make-options-doc: split docbook conversion from mergeJSON
this restores mergeJSON to its former glory if…merging json, and
extracts the MD rendering into a new script that will run instead of the
py+nix+xslt pipeline we previously ran to convert options.json to docbook.

this change alone gives a noticable performance boost when building
docs (18s instead of 27s to build optionsDocBook).

no changes to rendered output, except for a single example in the
rsnapshot module that uses hard tabs for indentation instead of spaces.
this probably isn't important.

docbook warnings remain with mergeJSON since the other processing steps
output single files instead of directories. since we'll only keep the
check until 23.11 this is probably also not important to fix.

also contains a few improvements to error reporting in the MD renderers.
2023-01-26 00:32:56 +01:00