about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFélix Baylac Jacqué <felix@alternativebit.fr>2023-11-16 18:16:15 +0100
committerFélix Baylac Jacqué <felix@alternativebit.fr>2023-11-16 18:16:15 +0100
commit7e7d40393950769de14a6d0e36ff0843af97703b (patch)
tree609368a12627315688683bc78ae25aaf3e32d99c /nixos
parentc79cf2f6ab6f8fe49cac6ca256b9b4b01b49f060 (diff)
nixosTests.pleroma: un-vendor toot
Upstream released 0.38.2. This new release contains the pleroma fix we
previously were getting from master.

We don't need this override anymore to get the test to succeed.

https://github.com/ihabunek/toot/issues/399#issuecomment-1814712723
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/pleroma.nix14
1 files changed, 1 insertions, 13 deletions
diff --git a/nixos/tests/pleroma.nix b/nixos/tests/pleroma.nix
index c80f48e52ed51..08a01585f8778 100644
--- a/nixos/tests/pleroma.nix
+++ b/nixos/tests/pleroma.nix
@@ -25,18 +25,6 @@
 
 import ./make-test-python.nix ({ pkgs, ... }:
   let
-  # Fix for https://github.com/ihabunek/toot/pull/405. Includes
-  # https://github.com/ihabunek/toot/pull/405. TOREMOVE when
-  # toot > 0.38.1
-  patched-toot = pkgs.toot.overrideAttrs (old: {
-    version = "unstable-24-09-2023";
-    src = pkgs.fetchFromGitHub {
-      owner = "ihabunek";
-      repo = "toot";
-      rev = "30857f570d64a26da80d0024227a8259f7cb65b5";
-      sha256 = "sha256-BxrI7UY9bfqPzS+VLqCFSmu4PkIkvhntcEeNJb1AzOs=";
-    };
-  });
   send-toot = pkgs.writeScriptBin "send-toot" ''
     set -eux
     # toot is using the requests library internally. This library
@@ -195,7 +183,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
       security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ];
       networking.extraHosts = hosts nodes;
       environment.systemPackages = with pkgs; [
-        patched-toot
+        pkgs.toot
         send-toot
       ];
     };