Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
8bd26a3f0e |
3 changed files with 13 additions and 156 deletions
|
|
@ -13,7 +13,7 @@
|
|||
%global giturl https://github.com/ocaml/dune
|
||||
|
||||
Name: ocaml-dune
|
||||
Version: 3.16.1
|
||||
Version: 3.17.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Composable build system for OCaml and Reason
|
||||
|
||||
|
|
@ -22,24 +22,21 @@ Summary: Composable build system for OCaml and Reason
|
|||
# - vendor/cmdliner
|
||||
# - vendor/fmt
|
||||
# - vendor/notty
|
||||
# - vendor/opam-0install
|
||||
# - vendor/sha
|
||||
# - vendor/uutf
|
||||
# LGPL-2.0-only:
|
||||
# LGPL-2.1-only:
|
||||
# - vendor/incremental-cycles
|
||||
# LGPL-2.0-only WITH OCaml-LGPL-linking-exception
|
||||
# LGPL-2.1-only WITH OCaml-LGPL-linking-exception
|
||||
# - vendor/ocaml-inotify
|
||||
# - vendor/opam
|
||||
# - vendor/opam-file-format
|
||||
# - vendor/re
|
||||
# LGPL-2.1-or-later:
|
||||
# - vendor/0install-solver
|
||||
# MIT:
|
||||
# - vendor/build_path_prefix_map
|
||||
# - vendor/fiber
|
||||
# - vendor/lwd
|
||||
# - vendor/spawn
|
||||
License: MIT AND ISC AND LGPL-2.0-only AND LGPL-2.0-only WITH OCaml-LGPL-linking-exception AND LGPL-2.1-or-later
|
||||
License: MIT AND ISC AND LGPL-2.1-only AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception
|
||||
URL: https://dune.build
|
||||
VCS: git:%{giturl}.git
|
||||
Source: %{giturl}/archive/%{version}/dune-%{version}.tar.gz
|
||||
|
|
@ -49,10 +46,6 @@ Patch: %{name}-no-lwt.patch
|
|||
# See https://github.com/ocaml/dune/issues/6929
|
||||
Patch: %{name}-debuginfo.patch
|
||||
|
||||
# Change to the furo theme for the docs
|
||||
# https://github.com/ocaml/dune/commit/9f3da04c1c27ff80e8d1ab71de15c53a0ca953da
|
||||
Patch: use-furo-theme.patch
|
||||
|
||||
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
|
|
@ -62,12 +55,13 @@ BuildRequires: ocaml >= 4.08
|
|||
BuildRequires: ocaml-compiler-libs
|
||||
%if !0%{?rhel}
|
||||
BuildRequires: ocaml-csexp-devel >= 1.5.0
|
||||
BuildRequires: ocaml-pp-devel >= 1.2.0
|
||||
BuildRequires: ocaml-pp-devel >= 2.0.0
|
||||
%endif
|
||||
BuildRequires: ocaml-rpm-macros
|
||||
|
||||
%if %{with docs}
|
||||
BuildRequires: %{py3_dist furo}
|
||||
BuildRequires: %{py3_dist myst-parser}
|
||||
BuildRequires: %{py3_dist sphinx}
|
||||
BuildRequires: %{py3_dist sphinx-copybutton}
|
||||
BuildRequires: %{py3_dist sphinx-design}
|
||||
|
|
@ -80,7 +74,6 @@ BuildRequires: ocaml-lwt-devel >= 5.6.0
|
|||
# Dune has vendored deps to avoid dependency cycles. Upstream deliberately
|
||||
# does not support unbundling these dependencies.
|
||||
# See https://github.com/ocaml/dune/issues/220
|
||||
Provides: bundled(ocaml-0install-solver) = 2.18
|
||||
Provides: bundled(ocaml-build-path-prefix-map) = 0.3
|
||||
Provides: bundled(ocaml-cmdliner) = 1.2.0
|
||||
Provides: bundled(ocaml-fiber) = 3.7.0
|
||||
|
|
@ -90,7 +83,6 @@ Provides: bundled(ocaml-inotify) = 2.3
|
|||
Provides: bundled(ocaml-lwd) = 0.3
|
||||
Provides: bundled(ocaml-notty) = 0.2.3
|
||||
Provides: bundled(ocaml-opam) = 2.2.0~alpha2
|
||||
Provides: bundled(ocaml-opam-0install) = 0.4.3
|
||||
Provides: bundled(ocaml-opam-file-format) = 2.1.6
|
||||
Provides: bundled(ocaml-re) = 1.11.0
|
||||
Provides: bundled(ocaml-sha) = 1.15.4
|
||||
|
|
@ -598,6 +590,12 @@ cd -
|
|||
%files -n ocaml-xdg-devel -f .ofiles-xdg-devel
|
||||
|
||||
%changelog
|
||||
* Tue Jan 28 2025 Jerry James <loganjerry@gmail.com> - 3.17.2-1
|
||||
- OCaml 5.2.1 rebuild for Fedora 41
|
||||
- Version 3.17.2
|
||||
- Update License field for changes in vendored dependencies
|
||||
- Drop upstreamed furo theme patch
|
||||
|
||||
* Thu Oct 31 2024 Jerry James <loganjerry@gmail.com> - 3.16.1-1
|
||||
- Version 3.16.1
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (dune-3.16.1.tar.gz) = 18e8022c5fa276e06f788cf25a4d6d08e3247c546cd69a5206d4e78ece1f47a615c6d5842e68e1fa7908cae7ae8c6e4f31d2eb835d97b5e6b5e4154957139e9f
|
||||
SHA512 (dune-3.17.2.tar.gz) = 8feaf89c5bada83d840e6a1e42ae9308375b07dabc2363015b667bcff638dd78acd526c1a43dd4730ab675b4828f7304e503b97e9f53397e73ed4e644693f260
|
||||
|
|
|
|||
|
|
@ -1,141 +0,0 @@
|
|||
From ef461f6000ffbf2f7381e3b8d1d9c7ecdd518b20 Mon Sep 17 00:00:00 2001
|
||||
From: Etienne Millon <me@emillon.org>
|
||||
Date: Fri, 2 Aug 2024 10:28:46 +0200
|
||||
Subject: [PATCH] docs: use furo theme (#10786)
|
||||
|
||||
* docs: use furo theme
|
||||
|
||||
This theme has several advantages compared to `sphinx_rtd_theme`:
|
||||
|
||||
- support for light and dark mode
|
||||
- a sidebar on the right with a table of contents for the current
|
||||
documentation
|
||||
- better use of horizontal space (half of the screen is unused with
|
||||
`sphinx_rtd_theme`)
|
||||
- "it looks better"
|
||||
|
||||
Signed-off-by: Etienne Millon <me@emillon.org>
|
||||
|
||||
* use sphinx >= 6
|
||||
|
||||
Signed-off-by: Etienne Millon <me@emillon.org>
|
||||
|
||||
---------
|
||||
|
||||
Signed-off-by: Etienne Millon <me@emillon.org>
|
||||
---
|
||||
doc/conf.py | 12 +++---------
|
||||
doc/coq.rst | 3 ---
|
||||
doc/hacking.rst | 5 -----
|
||||
doc/requirements.txt | 4 ++--
|
||||
flake.nix | 4 ++--
|
||||
5 files changed, 7 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/doc/conf.py b/doc/conf.py
|
||||
index 787d072..f3bd7ee 100644
|
||||
--- a/doc/conf.py
|
||||
+++ b/doc/conf.py
|
||||
@@ -74,7 +74,7 @@ language = "en"
|
||||
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
|
||||
|
||||
# The name of the Pygments (syntax highlighting) style to use.
|
||||
-pygments_style = 'sphinx'
|
||||
+pygments_style = 'friendly'
|
||||
|
||||
# If true, `todo` and `todoList` produce output, else they produce nothing.
|
||||
todo_include_todos = False
|
||||
@@ -85,13 +85,13 @@ todo_include_todos = False
|
||||
# The theme to use for HTML and HTML Help pages. See the documentation for
|
||||
# a list of builtin themes.
|
||||
#
|
||||
-html_theme = 'sphinx_rtd_theme'
|
||||
+html_theme = 'furo'
|
||||
|
||||
# Theme options are theme-specific and customize the look and feel of a theme
|
||||
# further. For a list of options available for each theme, see the
|
||||
# documentation.
|
||||
#
|
||||
-html_theme_options = {'navigation_depth': 6}
|
||||
+html_theme_options = {}
|
||||
|
||||
# Add any paths that contain custom static files (such as style sheets) here,
|
||||
# relative to this directory. They are copied after the builtin static files,
|
||||
@@ -155,12 +155,6 @@ texinfo_documents = [
|
||||
'Miscellaneous'),
|
||||
]
|
||||
|
||||
-
|
||||
-
|
||||
-import sphinx_rtd_theme
|
||||
-
|
||||
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
|
||||
-
|
||||
html_context = {
|
||||
'display_github': True,
|
||||
'github_user': 'ocaml',
|
||||
diff --git a/doc/coq.rst b/doc/coq.rst
|
||||
index 2266cc4..d20a4da 100644
|
||||
--- a/doc/coq.rst
|
||||
+++ b/doc/coq.rst
|
||||
@@ -11,9 +11,6 @@ Coq
|
||||
- reference info for stanzas and variables
|
||||
- tutorials (the examples part)
|
||||
|
||||
-.. contents:: Table of Contents
|
||||
- :depth: 3
|
||||
-
|
||||
Introduction
|
||||
------------
|
||||
|
||||
diff --git a/doc/hacking.rst b/doc/hacking.rst
|
||||
index 096ee5d..6f1ff14 100644
|
||||
--- a/doc/hacking.rst
|
||||
+++ b/doc/hacking.rst
|
||||
@@ -10,11 +10,6 @@ general guidelines specific to Dune. However, given that Dune is a large project
|
||||
developed by many different people, it's important to follow these guidelines in
|
||||
order to keep the project in a good state and pleasant to work on for everybody.
|
||||
|
||||
-.. contents:: Table of Contents
|
||||
- :depth: 1
|
||||
- :local:
|
||||
- :backlinks: none
|
||||
-
|
||||
Dependencies
|
||||
============
|
||||
|
||||
diff --git a/doc/requirements.txt b/doc/requirements.txt
|
||||
index 21f8f5f..b4a0e74 100644
|
||||
--- a/doc/requirements.txt
|
||||
+++ b/doc/requirements.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-sphinx >= 4.5.0, < 6
|
||||
-sphinx_rtd_theme >= 1.0.0
|
||||
+sphinx >= 6
|
||||
+furo
|
||||
sphinx-copybutton >= 0.5.0
|
||||
sphinx-design
|
||||
diff --git a/flake.nix b/flake.nix
|
||||
index 00f97e1..ca349f2 100644
|
||||
--- a/flake.nix
|
||||
+++ b/flake.nix
|
||||
@@ -122,7 +122,7 @@
|
||||
|
||||
docInputs = with pkgs'.python3.pkgs; [
|
||||
sphinx-autobuild
|
||||
- sphinx_rtd_theme
|
||||
+ furo
|
||||
sphinx-copybutton
|
||||
sphinx-design
|
||||
];
|
||||
@@ -164,7 +164,7 @@
|
||||
sphinx
|
||||
sphinx-autobuild
|
||||
python310Packages.sphinx-copybutton
|
||||
- python310Packages.sphinx-rtd-theme
|
||||
+ python310Packages.furo
|
||||
python310Packages.sphinx-design
|
||||
]
|
||||
);
|
||||
--
|
||||
2.46.2
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue