summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2023-11-16 21:20:06 +0100
committerGitHub <noreply@github.com>2023-11-16 21:20:06 +0100
commitda1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1 (patch)
tree84482cdaae1d80d3bd94c0dfc8377ab403bcb616 /nixos/tests
parent05a19f48a9f72d71954784ca6adaa365e95738e9 (diff)
parent7e7d40393950769de14a6d0e36ff0843af97703b (diff)
downloadnixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.tar
nixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.tar.gz
nixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.tar.bz2
nixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.tar.lz
nixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.tar.xz
nixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.tar.zst
nixpkgs-da1923d134244ccf6d6fabe7e7df0ad4a8b4b8b1.zip
Merge pull request #267931 from picnoir/pic/toot-0-38-2
toot: 0.38.1 -> 0.38.2
Diffstat (limited to 'nixos/tests')
-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 c80f48e52ed..08a01585f87 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
       ];
     };