FromCabal: remove LLVM evil

Author: emilazy

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal.hs

@@ -172,7 +172,6 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
 
     resolveInNixpkgs :: Identifier -> Binding
     resolveInNixpkgs i
-      | i `elem` ["clang","lldb","llvm"] = binding # (i, path # ["self","llvmPackages",i])     -- TODO: evil!
       | i == "gtk2"                      = binding # (i, path # ["pkgs","gtk2"])               -- TODO: these cases should not be necessary
       | i == "gtk3"                      = binding # (i, path # ["pkgs","gtk3"])
       | i == "gtksourceview3"            = binding # (i, path # ["pkgs","gtksourceview3"])

cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs

@@ -112,7 +112,7 @@ hooks =
   , ("git-annex >= 6.20170925 && < 6.20171214", set doCheck False)      -- some versions of git-annex require their test suite to be run inside of a git checkout
   , ("github-backup", set (executableDepends . tool . contains (pkg "git")) True)
   , ("GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))
-  , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "self.llvmPackages.llvm")) True)
+  , ("GlomeVec", set (libraryDepends . pkgconfig . contains (bind "pkgs.llvmPackages.llvm")) True)
   , ("graphviz", set (testDepends . system . contains (pkg "graphviz")) True)
   , ("gtk3", gtk3Hook)
   , ("gtkglext", gtkglextHook)

doc/frequently-asked-questions.rst

@@ -488,7 +488,7 @@ The solution is to add it as another package to the environment:
 
 .. code:: shell
 
-   $ nix-shell -p '(haskellPackages.ghcWithPackages.override { useLLVM = true; }) (ps: with ps; [mtl])' 'haskellPackages.llvmPackages.llvm'
+   $ nix-shell -p '(haskellPackages.ghcWithPackages.override { useLLVM = true; }) (ps: with ps; [mtl])' 'haskellPackages.ghc.llvmPackages.llvm'
 
    [nix-shell:~]$ llvm-ar --help
    OVERVIEW: LLVM Archiver