Commit 7e7d4039 authored by Félix Baylac Jacqué's avatar Félix Baylac Jacqué
Browse files

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
parent c79cf2f6

nixos/tests/pleroma.nix

+1 −13
Original line number Diff line number Diff line
@@ -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

      ];

    };