diff --git a/default.nix b/default.nix index bcbba47ce4f0..788392f0865c 100644 --- a/default.nix +++ b/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ hostname - python3 + python311 # coq-makefile timing tools time dune_3 @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { ] ++ optionals buildDoc [ # Sphinx doc dependencies - pkg-config (python3.withPackages + pkg-config (python311.withPackages (ps: [ ps.sphinx ps.sphinx_rtd_theme ps.pexpect ps.beautifulsoup4 - ps.antlr4-python3-runtime ps.sphinxcontrib-bibtex ])) - antlr4 + (ps.antlr4-python3-runtime.override {antlr4 = pkgs.antlr4_9;}) ps.sphinxcontrib-bibtex ])) + antlr4_9 ocamlPackages.odoc ] ++ optionals doInstallCheck [ diff --git a/dev/nixpkgs.nix b/dev/nixpkgs.nix index 7e9abd92ff19..346b3a61e298 100644 --- a/dev/nixpkgs.nix +++ b/dev/nixpkgs.nix @@ -1,4 +1,4 @@ import (fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/5b9b93b9be4234aaf9cd53e3247a927225095514.tar.gz"; - sha256 = "0wz4xr43rg1p2sqgi6zg3s02jfaxhl15slz747fh6h825i4cz9bb"; + url = "https://github.com/NixOS/nixpkgs/archive/a565059a348422af5af9026b5174dc5c0dcefdae.tar.gz"; + sha256 = "1spgz981x8p2ix9nsrkfw7a4n5wx35mf4v0bsjqfpjy360jb5rix"; }) diff --git a/doc/README.md b/doc/README.md index 2e3355492c3b..ba0365393883 100644 --- a/doc/README.md +++ b/doc/README.md @@ -33,7 +33,7 @@ reference manual requires Python 3, and the following Python packages: - sphinx >= 4.5.0 - sphinx_rtd_theme >= 1.0.0 - beautifulsoup4 >= 4.0.6 - - antlr4-python3-runtime >= 4.7.1 + - antlr4-python3-runtime >= 4.7.1 & <= 4.9.3 - pexpect >= 4.2.1 - sphinxcontrib-bibtex >= 0.4.2