Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d2bed2e217b7
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 38534b942e49
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 2, 2019

  1. resolveInNixpkgs: stop using GNOME aliases 

    They were removed in NixOS/nixpkgs#55735
    @jtojnar
    jtojnar committed Mar 2, 2019
    Copy the full SHA
    6b9bca8 View commit details

Commits on Mar 3, 2019

  1. Merge pull request #410 from jtojnar/no-gnome-aliases 

    resolveInNixpkgs: stop using GNOME aliases
    @peti
    peti authored Mar 3, 2019
    Copy the full SHA
    38534b9 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/Distribution/Nixpkgs/Haskell/FromCabal.hs
8 changes: 4 additions & 4 deletions src/Distribution/Nixpkgs/Haskell/FromCabal.hs
View file
Original file line number Diff line number Diff line change
@@ -136,10 +136,10 @@ 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","gnome2","gtk"])
| i == "gtk3" = binding # (i, path # ["pkgs","gnome3","gtk"])
| i == "gtksourceview3" = binding # (i, path # ["pkgs","gnome3","gtksourceview"])
| i == "vte_291" = binding # (i, path # ["pkgs","gnome3","vte"])
| i == "gtk2" = binding # (i, path # ["pkgs","gtk2"])
| i == "gtk3" = binding # (i, path # ["pkgs","gtk3"])
| i == "gtksourceview3" = binding # (i, path # ["pkgs","gtksourceview3"])
| i == "vte_291" = binding # (i, path # ["pkgs","vte"])
| Just p <- nixpkgsResolver i, init (view (reference . path) p) `Set.member` goodScopes = p
| otherwise = bindNull i