Unverified Commit e50dc6dd authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

Merge pull request #276898 from viraptor/bump-archivebox 

archivebox: 0.6.2 -> 0.7.1
parents c0bcc262 f4c049b0

pkgs/applications/misc/archivebox/default.nix

+21 −8
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 
, python3

, fetchFromGitHub

, fetchPypi

, nodePackages

, curl

, wget

, ripgrep

, nodejs

}:



let
@@ -34,6 +39,7 @@ let 
          rev = "e43f383dae3a35237e42f6acfe1207a8e7e7bdf5";

          hash = "sha256-NAMa78KhAuoJfp0Cb0Codz84sRfRQ1JhSLNYRI4GBPM=";

        };

        disabledTests = [ "test_should_highlight_bash_syntax_without_name" ];

      });

    };

  };
@@ -41,26 +47,33 @@ in 


python.pkgs.buildPythonApplication rec {

  pname = "archivebox";

  version = "0.6.2";

  version = "0.7.1";



  src = fetchPypi {

    inherit pname version;

    sha256 = "sha256-zHty7lTra6yab9d0q3EqsPG3F+lrnZL6PjQAbL1A2NY=";

    sha256 = "sha256-IBKYp6AKQTC6LiCS2KLGFy51/U18R+eYhbRdhrq8/pw=";

  };



  propagatedBuildInputs = with python.pkgs; [

    requests

    mypy-extensions

    croniter

    dateparser

    django

    django-extensions

    dateparser

    youtube-dl

    ipython

    mypy-extensions

    pdm-backend

    python-crontab

    croniter

    requests

    w3lib

    ipython

    yt-dlp

  ];



  makeWrapperArgs = [

    "--prefix PATH : ${lib.makeBinPath [ curl wget ripgrep nodejs nodePackages.readability-extractor nodePackages.postlight-parser ]}"

  ];



  format = "pyproject";



  meta = with lib; {

    description = "Open source self-hosted web archiving";

    homepage = "https://archivebox.io";

pkgs/development/node-packages/node-packages.json

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
, "@commitlint/cli"

, "@commitlint/config-conventional"

, "@microsoft/rush"

, "@postlight/parser"

, "@shopify/cli"

, "@tailwindcss/aspect-ratio"

, "@tailwindcss/forms"

pkgs/development/node-packages/node-packages.nix

+466 −0

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/development/node-packages/overrides.nix

+9 −0
Original line number Diff line number Diff line
@@ -250,6 +250,10 @@ final: prev: { 
    };

  });



  postlight-parser = prev."@postlight/parser".override {

    name = "postlight-parser";

  };



  # To update prisma, please first update prisma-engines to the latest

  # version. Then change the correct hash to this package. The PR should hold

  # two commits: one for the engines and the other one for the node package.
@@ -289,6 +293,11 @@ final: prev: { 
    '';

  };



  readability-extractor = prev.readability-extractor.override {

    nativeBuildInputs = [ pkgs.pkg-config ];

    buildInputs = [ pkgs.pango ];

  };



  rush = prev."@microsoft/rush".override {

    name = "rush";

  };