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: 07ca643cef7f
Choose a base ref
...
head repository: NixOS/cabal2nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a2d666dd262d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 5, 2018

  1. gdk-x11-3.0: point to the gtk3 package

    @mdorman
    mdorman committed May 5, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    tilpner Till Höppner
    GPG key ID: 6A13327225BE51F6
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2923434 View commit details

Commits on May 6, 2018

  1. Merge pull request #349 from mdorman/gdk-x11-3.0 

    gdk-x11-3.0: point to the gtk3 package
    @peti
    peti authored May 6, 2018
    Copy the full SHA
    a2d666d View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
1 change: 1 addition & 0 deletions src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,7 @@ libNixName "gdk-2.0" = return "gtk2"
libNixName "gdk-3.0" = return "gtk3"
libNixName "gdk-pixbuf-2.0" = return "gdk_pixbuf"
libNixName "gdk-x11-2.0" = return "gdk_x11"
libNixName "gdk-x11-3.0" = return "gtk3"
libNixName "gio-2.0" = return "glib"
libNixName "GL" = return "libGL"
libNixName "GLU" = ["libGLU","libGL"]