Unverified Commit da1923d1 authored by Matthias Beyer's avatar Matthias Beyer Committed by GitHub
Browse files

Merge pull request #267931 from picnoir/pic/toot-0-38-2 

toot: 0.38.1 -> 0.38.2
parents 05a19f48 7e7d4039

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

      ];

    };

pkgs/applications/misc/toot/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


python3Packages.buildPythonApplication rec {

  pname = "toot";

  version = "0.38.1";

  version = "0.38.2";



  src = fetchFromGitHub {

    owner  = "ihabunek";

    repo   = "toot";

    rev = "refs/tags/${version}";

    sha256 = "sha256-gT9xKFanQhptt46nkdzYsZ6Vu0Nab0oRsvEHVRNf8DQ=";

    sha256 = "sha256-0L/5i+m0rh1VjsZ0N2cshi+Nw951ASjMf5y6JxV53ko=";

  };



  nativeCheckInputs = with python3Packages; [ pytest ];
@@ -30,4 +30,3 @@ python3Packages.buildPythonApplication rec { 
  };



}