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

Commits on Jan 31, 2020

  1. bustle: disable hgettext flag by default 

    hgettext does not compile.
    @peti
    peti committed Jan 31, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    alyssais Alyssa Ross
    GPG key ID: F9DBED4859B271C0
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    25c72e7 View commit details

  2. bustle: fix the license, drop dependency on gio-unix, and fix meta.hy… 

    …draPlatforms
    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    2971916 View commit details
Showing with 9 additions and 1 deletion.
  1. +1 −0 src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs
  2. +8 −1 src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.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
@@ -16,6 +16,7 @@ configureCabalFlags' :: PackageIdentifier -> [(FlagName,Bool)]
configureCabalFlags' (PackageIdentifier name version)
| name == "accelerate-examples"= [disable "opencl"]
| name == "arithmoi" = [disable "llvm"]
| name == "bustle" = [disable "hgettext"] -- https://gitlab.freedesktop.org/bustle/bustle/issues/13
| name == "cabal-plan" = [enable "exe"]
| name == "cassava" = [disable "bytestring--lt-0_10_4"]
| name == "darcs" = [enable "library", enable "force-char8-encoding"]
9 changes: 8 additions & 1 deletion src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs
View file
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@ import Data.Set ( Set )
import qualified Data.Set as Set
import Distribution.Nixpkgs.Haskell
import Distribution.Nixpkgs.Meta
import Distribution.Nixpkgs.License
import Distribution.Package
import Distribution.System
import Distribution.Text
@@ -78,7 +79,7 @@ hooks =
, ("alsa-core", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))
, ("bindings-GLFW", over (libraryDepends . system) (Set.union (Set.fromList [bind "pkgs.xorg.libXext", bind "pkgs.xorg.libXfixes"])))
, ("bindings-lxc", over (metaSection . platforms) (Set.filter (\(Platform _ os) -> os == Linux)))
, ("bustle", set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True)
, ("bustle", bustleOverrides)
, ("Cabal", set doCheck False) -- test suite doesn't work in Nix
, ("Cabal >2.2", over (setupDepends . haskell) (Set.union (Set.fromList [self "mtl", self "parsec"]))) -- https://github.com/haskell/cabal/issues/5391
, ("cabal-helper", set doCheck False) -- https://github.com/DanielG/cabal-helper/issues/17
@@ -400,3 +401,9 @@ pandocOverrides = set phaseOverrides postInstall
, " mv \"man/\"*.1 $out/share/man/man1/"
, "'';"
]

bustleOverrides :: Derivation -> Derivation
bustleOverrides = set (libraryDepends . pkgconfig . contains "system-glib = pkgs.glib") True
. set (executableDepends . pkgconfig . contains ("gio-unix = null")) False
. set (metaSection . license) (Known "stdenv.lib.licenses.lgpl21Plus")
. set (metaSection . hydraPlatforms) allKnownPlatforms