Skip to content

Commit e38f102

Browse files
author
doyougnu
committed
build: remove unused extensions and overlays
specifically: - sphinx-exec-haskell
1 parent 6ae6393 commit e38f102

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
## underscore
4949
, 'sphinxcontrib.bibtex'
5050
, 'sphinx_copybutton'
51-
# , 'sphinxcontrib.execHS.ext'
5251
, 'sphinx_exec_directive'
5352
, 'conceptual_admonitions'
5453
]

flake.nix

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
url = "github:edolstra/flake-compat";
88
flake = false;
99
};
10-
sphinx-exec-haskell.url = "github:doyougnu/sphinx-exec-haskell";
1110
};
1211

13-
outputs = { self, nixpkgs, flake-utils, flake-compat, sphinx-exec-haskell }:
12+
outputs = { self, nixpkgs, flake-utils, flake-compat }:
1413
let press-theme-overlay = final: prev: {
1514
sphinx-press-theme = prev.python311Packages.buildPythonPackage rec {
1615
pname = "sphinx_press_theme";
@@ -49,14 +48,10 @@
4948
inherit version;
5049
sha256 = "sha256-lMo4QILqt6pEiIatN/LNxhiUGX3ziSWV+bfRahzmZWU=";
5150
};
52-
propagatedBuildInputs = [ prev.sphinx prev.python310Packages.matplotlib ];
51+
propagatedBuildInputs = [ prev.sphinx prev.python311Packages.matplotlib ];
5352
};
5453
};
5554

56-
sphinx-exec-haskell-overlay = system: final: prev: {
57-
sphinx-exec-haskell = sphinx-exec-haskell.packages.${system}.default;
58-
};
59-
6055
in
6156
flake-utils.lib.eachDefaultSystem
6257
(system:
@@ -65,7 +60,6 @@
6560
overlays = [ press-theme-overlay
6661
copy-button-overlay
6762
sphinx-exec-directive-overlay
68-
(sphinx-exec-haskell-overlay system)
6963
];
7064
} ;
7165

hoh.nix

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
}:
44

55
let
6-
pythonInputs = with pkgs.python310Packages; [
6+
pythonInputs = with pkgs.python311Packages; [
77
sphinx
88
sphinxcontrib-bibtex
99
sphinxcontrib-tikz
10+
sphinx-autobuild
11+
pip
1012
# marked as broken in nixpkgs unfortunately
1113
# sphinx-book-theme
1214
## until we have a reason for tex leave this commented out for CI
1315
# ourTexLive
1416
];
1517
nonPythonInputs = with pkgs; [ sphinx-press-theme # this comes from the overlay
1618
sphinx-copybutton # this comes from the overlay
17-
pandoc
19+
# pandoc
1820
# change once extension fixes are upstreamed
19-
# sphinx-exec-directive
21+
sphinx-exec-directive
2022
rst2html5
21-
sphinx-autobuild
22-
sphinx-exec-haskell
2323
ghc
2424
cabal-install
2525
git
@@ -29,10 +29,11 @@ pkgs.stdenv.mkDerivation {
2929
pname = "hoh";
3030
version = "0.0.1";
3131
src = ./.;
32-
propagatedBuildInputs = pythonInputs ++ nonPythonInputs;
32+
buildInputs = pythonInputs ++ nonPythonInputs;
3333

3434
preBuild = ''
35-
SOURCE_DATE_EPOCH="$(${pkgs.coreutils}/bin/date '+%s')"
35+
export SOURCE_DATE_EPOCH="$(${pkgs.coreutils}/bin/date '+%s')"
36+
pip list
3637
'';
3738

3839
buildPhase = ''

src/Case_Studies/klister.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ able to follow along. After reading this chapter, a reader should be able to
2020
spot inefficient data structure use by reading code, and GHC's profiling tools
2121
to diagnose memory performance issues and identify hot code. To read through the
2222
code, this `commit
23-
<https://github.com/gelisam/klister/commit/33501b2233ce865407a8a3ca7c090457f3375442>`__
23+
<https://github.com/gelisam/klister/commit/33501b2233ce865407a8a3ca7c090457f3375442>`
2424
is the result of the case study, and `here
25-
<https://github.com/gelisam/klister/tree/5aea4d2b9df8f6e9db276078570c1e1bd1306cd3>`__
25+
<https://github.com/gelisam/klister/tree/5aea4d2b9df8f6e9db276078570c1e1bd1306cd3>`
2626
is the state of the klister code base that the tutorial starts with.
2727

2828
The rest of the chapter is structured as follows. We introduce the |klister|

0 commit comments

Comments
 (0)