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

Commits on Nov 20, 2018

  1. fltkhs: enable opengl 

    As requested at NixOS/nixpkgs#50828
    @chris-martin
    chris-martin authored Nov 20, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    mkg20001 Maciej Krüger
    GPG key ID: 0D948CE19CF49C5F
    Verified
    Learn about vigilant mode
    Copy the full SHA
    701ada9 View commit details

  2. Merge pull request #388 from chris-martin/patch-1 

    fltkhs: enable opengl
    @peti
    peti authored Nov 20, 2018

    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
    d17f136 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs
1 change: 1 addition & 0 deletions src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ configureCabalFlags' (PackageIdentifier name version)
| name == "cassava" = [disable "bytestring--lt-0_10_4"]
| name == "darcs" = [enable "library", enable "force-char8-encoding"]
| name == "diagrams-builder" = [enable "cairo", enable "svg", enable "ps", enable "rasterific"]
| name == "fltkhs" = [enable "opengl"]
| name == "folds" = [disable "test-hlint"]
| name == "git-annex" = [ enable "assistant"
, enable "cryptonite"