public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ormolu: add from haskell package set

This commit is contained in:
Domen Kožar 2019-10-13 09:31:45 +02:00 committed by Peter Simons
parent e323aab13b
commit e5ae4a8dc6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -97,7 +97,10 @@ self: super: builtins.intersectAttrs super {
# profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8 # profiling is disabled to allow C++/C mess to work, which is fixed in GHC 8.8
cachix = disableLibraryProfiling super.cachix; cachix = disableLibraryProfiling super.cachix;
# avoid compiling twice by providing executable as a separate output (with small closure size)
niv = enableSeparateBinOutput super.niv; niv = enableSeparateBinOutput super.niv;
ormolu = enableSeparateBinOutput super.ormolu;
ghcid = enableSeparateBinOutput super.ghcid;
# Ensure the necessary frameworks for Darwin. # Ensure the necessary frameworks for Darwin.
OpenAL = if pkgs.stdenv.isDarwin OpenAL = if pkgs.stdenv.isDarwin
@ -109,7 +112,6 @@ self: super: builtins.intersectAttrs super {
then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox then addExtraLibrary super.proteaaudio pkgs.darwin.apple_sdk.frameworks.AudioToolbox
else super.proteaaudio; else super.proteaaudio;
ghcid = enableSeparateBinOutput super.ghcid;
hzk = overrideCabal super.hzk (drv: { hzk = overrideCabal super.hzk (drv: {
preConfigure = "sed -i -e /include-dirs/d hzk.cabal"; preConfigure = "sed -i -e /include-dirs/d hzk.cabal";

2
pkgs/top-level/all-packages.nix
View File

@ -10530,6 +10530,8 @@ in
niv = haskellPackages.niv.bin; niv = haskellPackages.niv.bin;
ormolu = haskellPackages.ormolu.bin;
capnproto = callPackage ../development/libraries/capnproto { }; capnproto = callPackage ../development/libraries/capnproto { };
captive-browser = callPackage ../applications/networking/browsers/captive-browser { }; captive-browser = callPackage ../applications/networking/browsers/captive-browser { };