about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-04-28 13:37:55 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2025-04-28 13:37:55 +0200
commit9557336692627ab9c942c30e19cd2a0ee5a7f410 (patch)
treeff5c7b0d8bc0aa4c590e7e6ee445e4a651c1319f
parentmodules/sharkey: Add required `@chown` syscall group to allow list (diff)
downloadnixos-server-9557336692627ab9c942c30e19cd2a0ee5a7f410.zip
pkgs/sharkey: 2025.2.2 -> 2025.2.3
There is no change log, as this is a security update.
-rw-r--r--pkgs/by-name/sh/sharkey/unstable_package.nix6
-rw-r--r--tests/by-name/sh/sharkey-cpu/test.nix7
-rw-r--r--tests/by-name/sh/sharkey/test.nix1
3 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/by-name/sh/sharkey/unstable_package.nix b/pkgs/by-name/sh/sharkey/unstable_package.nix
index 3922ca0..a88b7df 100644
--- a/pkgs/by-name/sh/sharkey/unstable_package.nix
+++ b/pkgs/by-name/sh/sharkey/unstable_package.nix
@@ -25,14 +25,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "sharkey";
-  version = "2025.2.2";
+  version = "2025.2.3";
 
   src = fetchFromGitLab {
     owner = "TransFem-org";
     repo = "Sharkey";
     domain = "activitypub.software";
     rev = finalAttrs.version;
-    hash = "sha256-KVr4KLtJ22LEk94GuxeTk8/GcFs7oU/gkoVTvrgbYBg=";
+    hash = "sha256-VBfkJuoQzQ93sUmJNnr1JUjA2GQNgOIuX+j8nAz3bb4=";
     fetchSubmodules = true;
   };
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     dontBuild = true;
     outputHashMode = "recursive";
-    outputHash = "sha256-XWcDchvrYSJr0s/DMb8FIEK7MdE6aC2bAbrW88Ig4ug=";
+    outputHash = "sha256-ALstAaN8dr5qSnc/ly0hv+oaeKrYFQ3GhObYXOv4E6I=";
   };
 
   nativeBuildInputs = [
diff --git a/tests/by-name/sh/sharkey-cpu/test.nix b/tests/by-name/sh/sharkey-cpu/test.nix
index d4f9332..438cfb3 100644
--- a/tests/by-name/sh/sharkey-cpu/test.nix
+++ b/tests/by-name/sh/sharkey-cpu/test.nix
@@ -11,7 +11,7 @@
 nixos-lib.runTest {
   hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
 
-  name = "sharkey-images";
+  name = "sharkey-cpu";
 
   node = {
     specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
@@ -40,7 +40,7 @@ nixos-lib.runTest {
         # Avoid an error from this service.
         "acme-sharkey.server".serviceConfig.ExecStart = pkgs.lib.mkForce "${pkgs.lib.getExe' pkgs.coreutils "true"}";
 
-        # Test, that sharkey's hardening still allows access to the CPUs.
+        # Test that sharkey's hardening still allows access to the CPUs.
         sharkey.serviceConfig.ExecStart = let
           nodejs = pkgs.lib.getExe pkgsUnstable.nodejs;
           script = pkgs.writeTextFile {
@@ -66,9 +66,8 @@ nixos-lib.runTest {
     from time import sleep
 
     start_all()
-    server.wait_for_unit("sharkey.service")
 
-    # Give the service time to start.
+    # Give the service time to run.
     sleep(3)
 
     with subtest("All services running"):
diff --git a/tests/by-name/sh/sharkey/test.nix b/tests/by-name/sh/sharkey/test.nix
index 40efe17..b2ad461 100644
--- a/tests/by-name/sh/sharkey/test.nix
+++ b/tests/by-name/sh/sharkey/test.nix
@@ -97,7 +97,6 @@ nixos-lib.runTest {
       # Start the actual testing machines
       start_all()
 
-
       with subtest("Add pebble ca key to all services"):
         for node in [name_server, server, client]:
           node.wait_for_unit("network-online.target")