From 607b0a1fa848da49acbbce0f6d953760a5b33304 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 26 Mar 2019 22:33:53 +0100 Subject: [PATCH 1/2] stylish-haskell: Add top-level package --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c87be9099e87..345d6d84b029 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5744,6 +5744,8 @@ in strongswanTNC = strongswan.override { enableTNC = true; }; strongswanNM = strongswan.override { enableNetworkManager = true; }; + stylish-haskell = haskell.lib.justStaticExecutables haskellPackages.stylish-haskell; + su = shadow.su; subsonic = callPackage ../servers/misc/subsonic { }; From f214efa6f128f36f4ecac5bee3e2227158b36391 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 26 Mar 2019 22:08:21 +0100 Subject: [PATCH 2/2] vimPlugins.vim-stylish-haskell: Patch path to executable --- pkgs/misc/vim-plugins/overrides.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 23914e02c01c..c3865fa1e00f 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -2,7 +2,7 @@ , python, cmake, meson, vim, ruby , which, fetchgit, fetchurl , llvmPackages, rustPlatform -, xkb-switch, fzf, skim +, xkb-switch, fzf, skim, stylish-haskell , python3, boost, icu, ncurses , ycmd, rake , gobject-introspection, glib, wrapGAppsHook @@ -405,4 +405,12 @@ self: super: { }; }); + vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + substituteInPlace ftplugin/haskell/stylish-haskell.vim --replace \ + 'g:stylish_haskell_command = "stylish-haskell"' \ + 'g:stylish_haskell_command = "${stylish-haskell}/bin/stylish-haskell"' + ''; + }); + }