Commit Graph

26250 Commits

Author SHA1 Message Date
Alyssa Ross
fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00
Maciej Krüger
511e56d76c
Merge pull request #140406 from mkg20001/mvn 2022-03-25 15:08:44 +01:00
Janne Heß
7d0e21c77e
nixos/test-runner: Allow writing to qemu stdin 2022-03-25 12:08:21 +01:00
Luflosi
ec415055ba nixos/ipfs: improve how the commandline flags are generated
Use `utils.escapeSystemdExecArgs` instead of relying on the exact way in which `toString` formats a list.
In https://github.com/NixOS/nixpkgs/pull/156706#discussion_r795867283 a suggestion was made and then implemented to replace `toString` with `concatStringsSep " "`.
@pennae then suggested to use `utils.escapeSystemdExecArgs` instead in https://github.com/NixOS/nixpkgs/pull/164846#issuecomment-1073001848.
2022-03-24 20:42:07 +00:00
Guillaume Girol
57b4185159
Merge pull request #164091 from Pascal-Vtx/fix/graylog-module
nixos/graylog: fix group creation
2022-03-24 20:13:55 +00:00
Robert Hensing
ce5a33e62b
Merge pull request #164660 from ncfavier/tests-restrict-arguments
nixos/testing: restrict arguments to makeTest
2022-03-24 17:01:47 +01:00
pennae
67281c4d29
Merge pull request #165285 from jpathy/patch-2
networking.greTunnels: Add ttl option
2022-03-24 08:10:23 +00:00
Peter Hoeg
39a6621150 nixos/https-dns-proxy: init module 2022-03-24 15:36:28 +08:00
Naïm Favier
a8296e7537
nixos/earlyoom: bring the module up to date (#163663)
* nixos/earlyoom: bring the module up to date

Removes deprecated option `ignoreOOMScoreAdjust`, introduces `killHook`
as a replacement for `notificationsCommand`, and adds an `extraArgs`
option for things not covered by the module.

* nixos/earlyoom: add nixos test

* nixos/earlyoom: add reportInterval

Allows setting the interval for logging a memory report. Defaults to
3600 following upstream
     (https://github.com/rfjakob/earlyoom/blob/master/earlyoom.default#L5)
to avoid flooding logs.

* nixos/earlyoom: add free{Mem,Swap}KillThreshold

Fixes https://github.com/NixOS/nixpkgs/issues/83504
2022-03-24 15:34:09 +08:00
Bernardo Meurer
25d1efa97e
Merge pull request #165386 from zhaofengli/moonraker-2022-03-10
moonraker: unstable-2021-12-05 -> unstable-2022-03-10
2022-03-23 10:33:10 -07:00
InternetUnexplorer
2e7cf56e45 kde/plasma5: 5.24.0 -> 5.24.3 2022-03-23 18:19:33 +08:00
Sandro
85ce10e75a
Merge pull request #164042 from mstarzyk/miller-6 2022-03-23 05:31:31 +01:00
Benjamin Staffin
6f5636223c keycloak-metrics-spi: init at 2.5.3 2022-03-22 19:57:11 -04:00
Zhaofeng Li
b1431381d0 nixos/tests/moonraker: init 2022-03-22 15:35:39 -07:00
Zhaofeng Li
0527ccaca7 nixos/moonraker: Grant polkit permissions for system-level operations 2022-03-22 15:35:38 -07:00
Zhaofeng Li
787aaea68e nixos/moonraker: Add iproute2 to path 2022-03-22 15:35:38 -07:00
jpathy
19bb72c070 networking.greTunnels: Add ttl option 2022-03-23 00:24:44 +05:30
Michal Sojka
611e9302f9 nixos-rebuild: add --no-flake switch
When a NixOS system uses flakes, i.e., /etc/nixos/flake.nix exists, it
is impossible to use nixos-rebuild to build a pre-flake
configuration.nix. Of course, one can directly use nix command to
build the configuration, but not everybody remembers the correct nix
options to do that.

With the new option, it is possible to build a pre-flake configuration
with command like this:

    nixos-rebuild build-vm -I nixos-config=./vm.nix --no-flake

The option might be useful for people following older pre-flake
tutorials on a flake-based system.
2022-03-22 19:03:10 +01:00
Benjamin Staffin
d6f50a5c8e keycloak: fix a missing newline when using plugins 2022-03-22 12:36:14 -04:00
aszlig
de4a69b2de
nixos/tests/avahi: Fix running background command
In https://github.com/NixOS/nixpkgs/pull/142747, the implementation
behind Machine.execute() has been changed to pipe all the command's
output into base64 on the guest machine.

Unfortunately this means that base64 is blocking until stdout is closed,
which in turn means that we now need to make sure that whenever we run a
program in background via "&" we also need to make sure to close stdout,
which we do by redirecting stdout to stderr.

Signed-off-by: aszlig <aszlig@nix.build>
2022-03-22 17:24:13 +01:00
Jacek Galowicz
6567abf122
Merge pull request #165268 from vkleen/nixos/tests/deduplicate-vlans
nixos/test-driver: deduplicate VLANs
2022-03-22 14:53:31 +01:00
Sivizius
b4c2ffaffa
nixos/wg-quick: add autostart option to interfaces (#162219)
This adds the option `networking.wg-quick.interfaces.<name>.autostart`, which defaults to `true`, which is the previous behavior. With this option set to `false`, the systemd-unit will no longer be set to `wantedBy = [ "multi-user.target" ]` and therefore the tunnel has to be enabled/disabled via `systemctl start/stop wg-quick-<name>`.

Co-authored-by: pennae <82953136+pennae@users.noreply.github.com>
2022-03-22 13:25:57 +00:00
Viktor Kleen
6d766ae8b7
nixos/test-driver: deduplicate VLANs
Naively deduplicate VLANs in the python driver for NixOS tests. The
current implementation accidentally works, since the VLan class mutates
the environment. On construction it sets QEMU_VDE_SOCKET_${id} and this
environment variable gets overwritten once a second VLAN with the same
id is constructed. Because the NIC flags passed to qemu just use the
QEMU_VDE_SOCKET_${id} environment variable, this implicitly chooses a
single vde_switch process for each VLAN.

However, this leads to unusable vde_switch processes being spawned in
each test run and as a side effect makes it impossible to access the
correct VLan objects in the interactive test driver. It also makes it
remarkably hard to understand why the current implementation ever
worked.
2022-03-22 13:16:28 +00:00
Kevin Cox
954f445608
Merge pull request #165252 from Luflosi/ipfs-hardening
nixos/ipfs: add systemd hardening
2022-03-22 08:10:01 -04:00
Peter Hoeg
052632fd15 nixos/iwd: workaround for race condition where wlan device disappears 2022-03-22 19:36:51 +08:00
Luflosi
41d45d674a
nixos/ipfs: add systemd hardening
Use the hardened systemd unit from upstream.
2022-03-22 11:12:14 +01:00
Artturi
6134c2f891
Merge pull request #161034 from andr1an/fix/nixos-generate-config-absolute-root-path 2022-03-22 02:35:06 +02:00
Benjamin Staffin
34006ebc9d Merge remote-tracking branch 'origin/master' into mvn 2022-03-21 18:37:45 -04:00
Robert Hensing
6c469679f6 Merge remote-tracking branch 'upstream/master' into tests-restrict-arguments 2022-03-21 23:17:17 +01:00
Robert Hensing
eb8b70c020 nixos: Make config.nix.enable pass test 2022-03-21 23:14:10 +01:00
Kevin Cox
18307675b9
Merge pull request #153091 from GoogleBot42/master
nvidia: Fix AMD APU for Prime Sync
2022-03-21 15:04:38 -04:00
Jörg Thalheim
9b2939da63
Merge pull request #164260 from Mic92/nix-ld
nix-ld: init at 1.0.0 + nixos module
2022-03-21 18:42:38 +00:00
Pascal Bach
4c3c80df54
Merge pull request #114393 from DarkDNA/feature/samba/network-online
nixos/samba: Add a wants=network-online.target to the target.
2022-03-21 19:25:50 +01:00
Maciek Starzyk
55d462eea9 miller: 5.10.3 -> 6.2.0 2022-03-21 19:04:25 +01:00
Googlebot
4007aa201b Merge remote-tracking branch 'upstream/master' 2022-03-21 11:32:36 -04:00
Kevin Cox
8ce16fcf62
Merge pull request #163451 from hercules-ci/stop-premature-warnings
Stop premature warnings, including `nix.settings` migration
2022-03-21 10:10:40 -04:00
Florian Klink
9427a17ccb
Merge pull request #164016 from bobvanderlinden/pr-refactor-systemd-module
nixos: systemd: split module up into multiple files
2022-03-21 13:03:55 +01:00
Bob van der Linden
397b8257a0
nixos: systemd-user: fix additionalUpstreamUserUnits description
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2022-03-21 12:30:37 +01:00
Manuel Bärenz
9046ecff84
Merge pull request #163608 from turion/dev_fix_keepassxc_163482
nixosTests.keepassxc: Add regression test for #163482
2022-03-21 12:24:32 +01:00
Janne Heß
8e60f86840
Merge pull request #164034 from helsinki-systems/clean/stc
nixos/switch-to-configuration: Major script cleanup
2022-03-21 12:13:23 +01:00
Jörg Thalheim
35eb6cf711 nix-ld: mention in changelog 2022-03-21 11:15:32 +01:00
Jörg Thalheim
a98ea7e6f8 nix-ld: init at 1.0.0 + nixos module 2022-03-21 11:15:32 +01:00
Izorkin
41f28e9fbc nixos/tests: add mastodon test 2022-03-20 21:01:03 +01:00
Sandro
3d48fda6f5
Merge pull request #164330 from Luflosi/fix-tor-client-disable 2022-03-20 19:51:30 +01:00
Sandro
bf7837529e
Merge pull request #103733 from JJJollyjim/term-tests 2022-03-20 18:57:18 +01:00
Benjamin Staffin
81b63b6ef6
nixos/oauth2_proxy: add missing oidc providers (#164632)
- Add adfs and keycloak-oidc providrs
- Sort the list alphabetically
2022-03-20 13:31:43 -04:00
Artturi
8cfcf8c9a9
Merge pull request #156200 from B4dM4n/nixos-tests-wine 2022-03-20 17:37:38 +02:00
Bob van der Linden
92af44e04d
nixos: systemd: remove unhelpful comments in additionalUpstreamSystemUnits
Co-authored-by: Janne Heß <janne@hess.ooo>
2022-03-20 16:14:13 +01:00
Janne Heß
2473cce829
nixos/switchTest: Also test boot/switch actions 2022-03-20 13:04:24 +01:00
Janne Heß
85874efcb0
nixos/switch-to-configuration: Make perlcritic happy 2022-03-20 13:04:23 +01:00