-
-
Notifications
You must be signed in to change notification settings - Fork 389
nix update #2892
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
nix update #2892
Changes from all commits
0141210
ca400df
42f2304
bb89cc6
8bef492
a58f97d
35f2989
5ba3cc4
abaadd7
a93d548
90f65cb
9b8f200
ac3ed9b
1674c88
fe77cc6
2e2bdc8
0801b0c
67745f9
7f725e0
72717b2
b26ca70
f72ddb8
e639e62
7116967
bf7c5fe
e81b50b
7ffa9ed
cbeb2e9
39fa0eb
3b29588
e507922
0818140
8783487
349a877
afe7068
76d7692
9a1bdd1
c8d13e3
bc72be4
cff1918
45194c9
3bcb951
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
{ pkgs, inputs }: | ||
|
||
let | ||
disabledPlugins = [ "hls-brittany-plugin" "hls-stylish-haskell-plugin" ]; | ||
|
||
hpkgsOverride = hself: hsuper: | ||
with pkgs.haskell.lib; | ||
{ | ||
hlsDisabledPlugins = disabledPlugins; | ||
# YOLO | ||
mkDerivation = args: | ||
hsuper.mkDerivation (args // { | ||
jailbreak = true; | ||
doCheck = false; | ||
}); | ||
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) { | ||
# ptr-poker breaks on MacOS without SSE2 optimizations | ||
# https://github.com/nikita-volkov/ptr-poker/issues/11 | ||
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; | ||
|
||
ghc-lib = hself.ghc-lib_9_2_2_20220307; | ||
ghc-lib-parser = hself.ghc-lib-parser_9_2_2_20220307; | ||
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_3; | ||
|
||
Cabal = hself.Cabal_3_6_3_0; | ||
ormolu = hself.ormolu_0_4_0_0; | ||
fourmolu = hself.fourmolu_0_6_0_0; | ||
|
||
# Hlint is still broken | ||
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint-34 { }); | ||
|
||
hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin" | ||
./plugins/hls-hlint-plugin | ||
(pkgs.lib.concatStringsSep " " [ "-fhlint34" "-fghc-lib" ]) { }; | ||
|
||
# Re-generate HLS drv excluding some plugins | ||
haskell-language-server = | ||
hself.callCabal2nixWithOptions "haskell-language-server" ./. | ||
(pkgs.lib.concatStringsSep " " [ "-f-brittany" "-f-stylishhaskell" ]) | ||
{ }; | ||
}); | ||
in { | ||
inherit disabledPlugins; | ||
tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
{ pkgs, inputs }: | ||
|
||
let | ||
disabledPlugins = [ | ||
"hls-hlint-plugin" | ||
# That one is not technically a plugin, but by putting it in this list, we | ||
# get it removed from the top level list of requirement and it is not pull | ||
# in the nix shell. | ||
"shake-bench" | ||
]; | ||
|
||
hpkgsOverride = hself: hsuper: | ||
with pkgs.haskell.lib; | ||
{ | ||
hlsDisabledPlugins = disabledPlugins; | ||
# YOLO | ||
mkDerivation = args: | ||
hsuper.mkDerivation (args // { | ||
jailbreak = true; | ||
doCheck = false; | ||
}); | ||
} // (builtins.mapAttrs (_: drv: disableLibraryProfiling drv) { | ||
# ptr-poker breaks on MacOS without SSE2 optimizations | ||
# https://github.com/nikita-volkov/ptr-poker/issues/11 | ||
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { }; | ||
|
||
ghc-exactprint = | ||
hself.callCabal2nix "ghc-exactprint" inputs.ghc-exactprint-150 { }; | ||
# Hlint is still broken | ||
hlint = doJailbreak (hself.callCabal2nix "hlint" inputs.hlint { }); | ||
|
||
# Re-generate HLS drv excluding some plugins | ||
haskell-language-server = | ||
hself.callCabal2nixWithOptions "haskell-language-server" ./. | ||
(pkgs.lib.concatStringsSep " " [ "-fpedantic" "-f-hlint" ]) { }; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This line should be in sync with Also, I'm surprised that there is less disabledPlugins with GHC 9.2 compared to GHC 9.0. Is that a mistake or is our support for GHC 9.2 better than 9.0? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. disabled "hls-hlint-plugin". re > why 922 builds more plugins than 902 I have no idea, sorry. Anyone else can help with this? |
||
}); | ||
in { | ||
inherit disabledPlugins; | ||
tweakHpkgs = hpkgs: hpkgs.extend hpkgsOverride; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
Sphinx==4.0.2 | ||
sphinx-rtd-theme==0.5.2 | ||
myst-parser==0.15.1 | ||
docutils<0.17 | ||
docutils<0.19 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
{ stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, python }: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nixpkgs contains There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The RTD theme doesn't work with newer docutils, hence the anchor on There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ha, great. |
||
|
||
buildPythonPackage rec { | ||
pname = "docutils"; | ||
version = "0.17.1"; | ||
|
||
src = fetchPypi { | ||
inherit pname version; | ||
sha256 = "686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"; | ||
}; | ||
|
||
# Only Darwin needs LANG, but we could set it in general. | ||
# It's done here conditionally to prevent mass-rebuilds. | ||
checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) | ||
''LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" '' + '' | ||
${python.interpreter} test/alltests.py | ||
''; | ||
|
||
# Create symlinks lacking a ".py" suffix, many programs depend on these names | ||
postFixup = '' | ||
for f in $out/bin/*.py; do | ||
ln -s $(basename $f) $out/bin/$(basename $f .py) | ||
done | ||
''; | ||
|
||
meta = with lib; { | ||
description = "Python Documentation Utilities"; | ||
homepage = "http://docutils.sourceforge.net/"; | ||
license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; | ||
maintainers = with maintainers; [ AndersonTorres ]; | ||
}; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pulls the latest revision of
ptr-poker
from hackage