From 4d4636e76c99953df248a4453e8e8af241009eb0 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 17 Mar 2019 13:59:53 -0700 Subject: [PATCH] Add Brittany to the set of build tools --- brittany.yaml | 45 +++++++++++++++++++++++++++++++++++++++++++++ default.nix | 20 ++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 brittany.yaml diff --git a/brittany.yaml b/brittany.yaml new file mode 100644 index 0000000..e384c9f --- /dev/null +++ b/brittany.yaml @@ -0,0 +1,45 @@ +conf_debug: + dconf_roundtrip_exactprint_only: false + dconf_dump_bridoc_simpl_par: false + dconf_dump_ast_unknown: false + dconf_dump_bridoc_simpl_floating: false + dconf_dump_config: false + dconf_dump_bridoc_raw: false + dconf_dump_bridoc_final: false + dconf_dump_bridoc_simpl_alt: false + dconf_dump_bridoc_simpl_indent: false + dconf_dump_annotations: false + dconf_dump_bridoc_simpl_columns: false + dconf_dump_ast_full: false +conf_forward: + options_ghc: [] +conf_errorHandling: + econf_ExactPrintFallback: ExactPrintFallbackModeInline + econf_Werror: false + econf_omit_output_valid_check: false + econf_produceOutputOnErrors: false +conf_preprocessor: + ppconf_CPPMode: CPPModeWarn + ppconf_hackAroundIncludes: false +conf_obfuscate: false +conf_roundtrip_exactprint_only: false +conf_version: 1 +conf_layout: + lconfig_reformatModulePreamble: true + lconfig_altChooser: + tag: AltChooserBoundedSearch + contents: 3 + lconfig_allowSingleLineExportList: true + lconfig_importColumn: 50 + lconfig_hangingTypeSignature: false + lconfig_importAsColumn: 50 + lconfig_alignmentLimit: 30 + lconfig_indentListSpecial: true + lconfig_indentAmount: 2 + lconfig_alignmentBreakOnMultiline: true + lconfig_cols: 80 + lconfig_indentPolicy: IndentPolicyFree + lconfig_indentWhereSpecial: true + lconfig_columnAlignMode: + tag: ColumnAlignModeMajority + contents: 0.7 diff --git a/default.nix b/default.nix index d172d42..8f3dd05 100644 --- a/default.nix +++ b/default.nix @@ -48,6 +48,25 @@ let (self: super: with pkgs.haskell.lib; { mono-traversable = dontCheck super.mono-traversable; these = doJailbreak super.these; + multistate = doJailbreak super.multistate; + + brittany = doJailbreak (self.callCabal2nix "brittany" + (pkgs.fetchFromGitHub { + owner = "lspitzner"; + repo = "brittany"; + rev = "6c187da8f8166d595f36d6aaf419370283b3d1e9"; + sha256 = "0nmnxprbwws3w1sh63p80qj09rkrgn9888g7iim5p8611qyhdgky"; + # date = 2018-11-30T22:13:02+01:00; + }) {}); + + ghc-exactprint = dontCheck (self.callCabal2nix "ghc-exactprint" + (pkgs.fetchFromGitHub { + owner = "alanz"; + repo = "ghc-exactprint"; + rev = "281f65324fb1fcad8f5ceec06f5ea4c7d78cfb59"; + sha256 = "1d6sjy5mw0jn09sgx7zn0w1gszn3mf6lzqsfv3li50fnvwv1gwzb"; + # date = 2019-03-01T17:38:18+02:00; + }) {}); } // pkgs.lib.optionalAttrs withHoogle { ghc = super.ghc // { withPackages = super.ghc.withHoogle; }; ghcWithPackages = self.ghc.withPackages; @@ -72,6 +91,7 @@ drv = haskellPackages.developPackage { modifier = drv: pkgs.haskell.lib.overrideCabal drv (attrs: { buildTools = (attrs.buildTools or []) ++ [ haskellPackages.cabal-install + haskellPackages.brittany ]; enableLibraryProfiling = doProfiling;