3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

27932 commits

Author SHA1 Message Date
7c6f434c d77afe094c
Merge pull request #179055 from Izorkin/update-nginx
update nginx
2022-07-03 06:43:26 +00:00
Jan Tojnar 6a7da5b520 geocode-glib: fix installed tests 2022-07-02 20:14:11 +02:00
Et7f3 6b820ecfab
nixos: systemd: add missing sliceToUnit (#179841)
Seem to be omitted in 022b4209a3 (diff-5ea4693beb4bdd8f7efcdd3204ceea67c86f59b3d1c28cde063ddf03e1d20fbfL29).
2022-07-02 18:56:53 +03:00
Jan Tojnar f58225ffd4
Merge pull request #179849 from jtojnar/gnome
GNOME updates
2022-07-02 15:07:52 +02:00
Mario Rodas 10dde21ef6
Merge pull request #178852 from NickCao/maddy
maddy: 0.5.4 -> 0.6.2
2022-07-01 22:54:01 -05:00
Nick Cao 5aebd3c2f7
maddy: 0.5.4 -> 0.6.2 2022-07-02 09:38:23 +08:00
Jan Tojnar fb2877c36f geocode-glib: 3.26.2 → 3.26.3
https://gitlab.gnome.org/GNOME/geocode-glib/-/compare/3.26.2...3.26.3

- Add support for linking against libsoup 3 (incompatible ABI).
- Format the expression.
- Register installed tests (currently broken).
2022-07-02 02:23:00 +02:00
Martin Weinelt c0d1de14b3
Merge pull request #179291 from dotlambda/utillinux-alias
treewide: don't use utillinux alias
2022-07-02 00:05:54 +02:00
James Hannah c6e76ab7c9 nixos/radvd: add package option
Allow package users to override the package for radvd.
2022-07-01 21:11:46 +02:00
Silvan Mosberger 9b68a413da
Merge pull request #179796 from klemensn/desktop-manager-literal-newline
nixos/desktop-manager: Use literal newline to fix shell syntax
2022-07-01 20:32:00 +02:00
7c6f434c 8d002d4a47
Merge pull request #179442 from alyssais/dictd
nixos/dictd: make dict use local server
2022-07-01 16:52:54 +00:00
7c6f434c 95d4ce2175
Merge pull request #164048 from hqurve/jupyter-extra-paths
Jupyter kernel: link extra paths and fix missing docs in sagemath jupyter
2022-07-01 16:43:02 +00:00
Klemens Nanni 987400b848 nixos/desktop-manager: Use literal newline to fix shell syntax
Running `nixos/tests/keepassxc.nix` shows:
```
machine # [   18.705390] xsession[985]: /nix/store/2g2jx5c6x3p152wbiijr0rmky7byqivc-xsession: line 13: nn: command not found
```

This garbled bash script runs without `set -o errexit` and thus skips
"\n\n" as invalid command:
```
$ cat -n /nix/store/2g2jx5c6x3p152wbiijr0rmky7byqivc-xsession
...
\n\n
            if [ -e $HOME/.background-image ]; then
              /nix/store/wq1d1ph8wj4alpx78akvpbd0a0m9qkd1-feh-3.8/bin/feh --bg-scale  $HOME/.background-image
            fi
...
```

KeePassXC uses it through
`nixos/modules/services/x11/display-managers/default.nix`:
```
...
        # Script responsible for starting the window manager and the desktop manager.
        xsession = dm: wm: pkgs.writeScript "xsession" ''
          #! ${pkgs.bash}/bin/bash

          # Legacy session script used to construct .desktop files from
          # `services.xserver.displayManager.session` entries. Called from
          # `sessionWrapper`.

          # Start the window manager.
          ${wm.start}

          # Start the desktop manager.
          ${dm.start}
...
        '';
...
```

The bogus line was introduced in PR #160752:
```
commit 0bc0dc8090
Author: Shaw Vrana <shaw@vranix.com>
Date:   Fri Feb 18 11:27:42 2022 -0800

    desktop manager script: start properly

    Adds a missing line feed when X is enabled to the start script name
    and the appended if check. Resolves #160735
```

I have not tried to reproduce the original issue and thus don't know
why "\n\n" apparently gets interpreted fine in one place but remains
literal the `xsession` case.

However, using a literal newline must be valid for all cases and
certainly fixes the warning seen in KeePassXC tests.

Furthermore, starting the nix string (`''`) with a newline as usual also
fixes its overall indentation.
2022-07-01 16:30:47 +04:00
Sandro 911a73340c
Merge pull request #175335 from wyndon/init-lokinet 2022-07-01 11:54:38 +02:00
ckie a8c2879f43
Merge pull request #179425 from McSinyx/phylactery
phylactery: init at 0.1.1
2022-06-30 18:29:19 +03:00
Domen Kožar 989565d676 cachix-agent: expose verbose option 2022-06-30 09:56:28 -05:00
wyndon 69e1e00ebb
nixos/lokinet: init 2022-06-30 16:01:50 +02:00
Nguyễn Gia Phong ce910fca88
nixos/tests: add phlactery 2022-06-30 22:50:08 +09:00
Nguyễn Gia Phong f5f338c846
nixos/phylactery: init 2022-06-30 22:50:08 +09:00
José Romildo Malaquias f72be3af76
Merge pull request #179220 from romildo/fix.xfconf
nixos/xfconf: init
2022-06-30 07:39:27 -03:00
Florian Klink f5b87a8203
Merge pull request #179487 from catap/parallels-virt
nixos-generate-config: detects parallels virtualization
2022-06-30 10:04:03 +07:00
Domen Kožar 5a14883a5f
Merge pull request #179634 from domenkozar/cachix-agent-avoid-restarts
cachix-agent: properly handle not restarting the service
2022-06-29 17:37:00 -05:00
Domen Kožar c7b135ac8e cachix-agent: properly handle not restarting the service 2022-06-29 17:17:35 -05:00
Sandro a59be4f6c8
Merge pull request #175919 from phaer/phaer-healthchecks
healthchecks: init at 2.2.1
2022-06-29 23:15:35 +02:00
Izorkin f169a1af97
nixos/tests: small update nginx-http3 test 2022-06-29 22:39:14 +03:00
ajs124 15e41e3edf
Merge pull request #179358 from helsinki-systems/upd/jitsi
jitsi: update
2022-06-29 21:09:19 +02:00
Kirill A. Korinsky 08ddd8a5fc
nixos-generate-config: detect parallels virtualization 2022-06-29 16:01:08 +02:00
Jan Tojnar ce28c99140
Merge pull request #179204 from jtojnar/no-gtk-xdg-use-portal
nixos/xdg.portal: deprecate gtkUsePortal option
2022-06-29 14:24:43 +02:00
ajs124 a0718341e6 maintainers: remove volth
github account deleted
2022-06-29 00:52:12 +02:00
ajs124 729764a32d nixos/tests/jitsi-meet: remove grep for successfull health check
afaict, it doesn't log this anymore after https://github.com/jitsi/jitsi-videobridge/pull/1188
2022-06-29 00:32:53 +02:00
ajs124 aea940da63 nixos/jitsi-meet: move prosodyctl calls into prosody preStart 2022-06-29 00:19:57 +02:00
Alex Wied 4d269d11e3 nixos/doc: Fix typo in activation-script.md 2022-06-28 17:46:16 -04:00
Artturi 3cff3f75b4
Merge pull request #166340 from max-privatevoid/patch-6 2022-06-28 19:55:10 +03:00
pennae fe62b1b20f
Merge pull request #179440 from alyssais/ids-typo
nixos/ids: fix typo in comment
2022-06-28 15:47:35 +00:00
Alyssa Ross 4684ff771e
nixos/dictd: make dict use local server
Seems silly to install this for use with the local server, but to not
configure it to use the local server.  Otherwise, out of the box we
just get an error about no server being configured.
2022-06-28 12:22:45 +00:00
Alyssa Ross 0a2337c4da
nixos/ids: fix typo in comment 2022-06-28 11:58:47 +00:00
Sandro 6dce91f57b
Merge pull request #178336 from astro/openwebrx 2022-06-28 11:36:27 +02:00
phaer 12d45dc313 healthchecks: init at 2.2.1 2022-06-28 10:28:46 +02:00
happysalada b90fa9940b dgraph: add module 2022-06-28 02:34:54 -04:00
Astro 9123ed5f36 openwebrx: 1.1.0 -> 1.2.0 2022-06-28 00:46:32 +02:00
Robert Hensing 47dd5d15c1
Merge pull request #179351 from hercules-ci/option-docs-improvements
Option docs improvements
2022-06-27 22:51:22 +02:00
Pascal Bach 13df7151e1
Merge pull request #178783 from greizgh/fix-syncthing-doc
nixos/syncthing: fix services.syncthing.folders description
2022-06-27 22:37:56 +02:00
Robert Hensing 7c81905344 nixos/make-options-doc: Support Nix-provided declaration locations
Feature was introduced in https://github.com/NixOS/nixpkgs/pull/174460,
but wasn't supported in `mergeJSON.py` yet.
2022-06-27 22:07:20 +02:00
Martin Weinelt 9525331e5a
Merge pull request #179322 from mweinelt/mozilla 2022-06-27 20:52:02 +02:00
Robert Hensing 8bff3fef40 nixos/make-options-doc: Support block quotes
Our tooling would trip without the inner <para>, despite the docbook
docs suggesting that <para> occurs in <blockquote> and vice versa.
2022-06-27 17:41:32 +02:00
Robert Hensing e04aa1bcd9 nixos/make-options-doc: Escape inline code and code blocks 2022-06-27 17:41:32 +02:00
Robert Hensing f900ed1749 nixos/make-options-doc: Support newline md node
This occurs in the ast generated for blockquotes.
2022-06-27 17:41:32 +02:00
Robert Hensing bccc3e747b nixos/make-options-doc: Fix exception handler for arity /= 1 methods 2022-06-27 17:41:32 +02:00
Robert Hensing aff2dbbc82 make-options-doc: Make variablelist id configurable
I've tried XInclude set-xml-id first, but our tooling did not pick up on it.
2022-06-27 17:41:32 +02:00
Robert Hensing 49237015d6 nixos/doc: Make nixos-manual-combined fail easy to inspect
By writing the unchecked outputs before checking them, they will
be written to a store path, which appears in the log, and which
sticks around even if the build fails. Eventually it is GCed, but
until then, you can open the file.

If you run it in a terminal+editor combination like VSCode, the
failure location is just one Ctrl+click away.
2022-06-27 17:41:32 +02:00