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

Commits on May 9, 2018

  1. libNixName: sort cases alphabetically

    @peti
    peti committed May 9, 2018
    Copy the full SHA
    241b374 View commit details

  2. libNixName: add mappings for dbusmenu-glib-0.4 and dbusmenu-gtk3-0.4

    @peti
    peti committed May 9, 2018
    Copy the full SHA
    d8bc043 View commit details
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
4 changes: 3 additions & 1 deletion src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs
View file
Original file line number Diff line number Diff line change
@@ -38,6 +38,8 @@ libNixName "cairo-svg" = return "cairo"
libNixName "crypt" = [] -- provided by glibc
libNixName "crypto" = return "openssl"
libNixName "curses" = return "ncurses"
libNixName "dbusmenu-glib-0.4" = return "libdbusmenu-glib"
libNixName "dbusmenu-gtk3-0.4" = return "libdbusmenu-gtk3"
libNixName "dl" = [] -- provided by glibc
libNixName "fftw3" = return "fftw"
libNixName "fftw3f" = return "fftwFloat"
@@ -131,10 +133,10 @@ libNixName "sane-backends" = return "saneBackends"
libNixName "sass" = return "libsass"
libNixName "sctp" = return "lksctp-tools" -- This is linux-specific, we should create a common attribute if we ever add sctp support for other systems.
libNixName "sdl2" = return "SDL2"
libNixName "ssh2" = return "libssh2"
libNixName "sndfile" = return "libsndfile"
libNixName "sodium" = return "libsodium"
libNixName "sqlite3" = return "sqlite"
libNixName "ssh2" = return "libssh2"
libNixName "ssl" = return "openssl"
libNixName "statgrab" = return "libstatgrab"
libNixName "stdc++" = [] -- What is that?