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: 38534b942e49
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 74e5d360bf68
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 3, 2019

  1. fromPackageDescription: add TODO note to resolveInNixpkgs 

    The special cases for those GNOME packages should not be necessary.
#410 should simply remove them,
but unfortunately `nix-env -qaP` does not list `gtk2` so we cannot
discover the name.
    @peti
    peti committed Mar 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    74e5d36 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/Distribution/Nixpkgs/Haskell/FromCabal.hs
2 changes: 1 addition & 1 deletion src/Distribution/Nixpkgs/Haskell/FromCabal.hs
View file
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ 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"])
| 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"])
| i == "vte_291" = binding # (i, path # ["pkgs","vte"])