Skip to content

Commit

Permalink
mob next [ci-skip] [ci skip] [skip ci]
Browse files Browse the repository at this point in the history 
lastFile:.nixos-test-history
  • Loading branch information
@GetPsyched
GetPsyched committed May 7, 2024
1 parent 87fb544 commit ad2e9a5
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 2 deletions.
30 changes: 30 additions & 0 deletions .nixos-test-history
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

# 2024-05-07 18:43:06.462636
+start_all()

# 2024-05-07 18:43:57.833318
+server.shell_interact

# 2024-05-07 18:44:00.335825
+server.shell_interact()

# 2024-05-07 18:52:16.357409
+start_all()

# 2024-05-07 18:53:01.040001
+server.shell_interact

# 2024-05-07 18:53:03.145399
+server.shell_interact()

# 2024-05-07 19:10:44.289623
+start_all

# 2024-05-07 19:10:45.953866
+start_all()

# 2024-05-07 19:11:19.260851
+server.shell_interact

# 2024-05-07 19:11:22.630345
+server.shell_interact()
5 changes: 3 additions & 2 deletions pkgs/by-name/vula/package.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ in
]
++ [highctidh];

# FIXME: Test activation via dbus
postInstall = ''
mkdir -p $out/{lib/systemd/system,/share/dbus-1/system-services}
cp configs/systemd/* $out/lib/systemd/system/
mkdir -p $out/{etc/systemd/system,/share/dbus-1/system-services}
cp configs/systemd/* $out/etc/systemd/system/

This comment has been minimized.

Sign in to view

Copy link
@lorenzleutgeb

lorenzleutgeb May 16, 2024 •
edited
Loading

Member

I believe this change is wrong.

See:

  1. Search for lib/systemd and systemd.packages in Nixpkgs.
  2. The section "systemd in NixOS" of the NixOS Manual says: "Packages in Nixpkgs sometimes provide systemd units with them, usually in e.g #pkg-out#/lib/systemd/."
  3. The implementation behind systemd.packages uses lib/systemd/systemd-${type}.

Do you have any justification for it?

The only issue I see here is that the code linked in (3.) uses system-${type}, which clashes. But this also clashes with many results in (1.), so I am slightly confused. But I still believe that the change to /etc is wrong.

Maybe the correct path is $out/lib/systemd/system-generators?
cp configs/dbus/* $out/share/dbus-1/system-services/
'';

Expand Down

0 comments on commit ad2e9a5

Please sign in to comment.