diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f21ebfc149..0e66938e67d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -86013,7 +86013,7 @@ self: { "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath - , fltk14, libGLU_combined, mtl, OpenGLRaw, parsec, pkgconfig, text + , fltk14, libGL, libGLU, mtl, OpenGLRaw, parsec, pkg-config, text , vector }: mkDerivation { @@ -86026,15 +86026,15 @@ self: { setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring text vector ]; librarySystemDepends = [ fltk14 ]; - libraryPkgconfigDepends = [ libGLU_combined ]; - libraryToolDepends = [ c2hs pkgconfig ]; + libraryPkgconfigDepends = [ libGL libGLU ]; + libraryToolDepends = [ c2hs pkg-config ]; executableHaskellDepends = [ base directory filepath mtl OpenGLRaw parsec text ]; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) fltk14; inherit (pkgs) libGLU_combined; - pkgconfig = null;}; + }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; + inherit (pkgs) libGLU; inherit (pkgs) pkg-config;}; "fltkhs-demos" = callPackage ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm @@ -120063,7 +120063,7 @@ self: { pname = "hlibsass"; version = "0.1.8.0"; sha256 = "1ssgvr0jvl79k1vckp5nq2zw6mx8l4xasydymzjwmhg0fl99mpi6"; - configureFlags = [ "-fexternalLibsass" ]; + configureFlags = [ "-fexternallibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; librarySystemDepends = [ libsass ]; @@ -137850,7 +137850,7 @@ self: { sha256 = "1c7byr943x41nxpc3bnz152fvfbmakafq2958wyf9qiyp2pz18la"; revision = "1"; editedCabalFile = "0n0qs5lgryh3zxy73j3qbpnxand43yd2bj6pclvyii8apqqp901a"; - configureFlags = [ "-fNoInteractiveTests" ]; + configureFlags = [ "-fnointeractivetests" ]; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -148823,22 +148823,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-regex-pcre_1_0_0_1" = callPackage - ({ mkDerivation, base, bytestring, gauge, hspec, lens, pcre-heavy - , template-haskell, text + "lens-regex-pcre_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, gauge, hspec, lens + , pcre-heavy, pcre-light, template-haskell, text }: mkDerivation { pname = "lens-regex-pcre"; - version = "1.0.0.1"; - sha256 = "0g103a415npasr9a8ay1bs1f7m24w8f53h9x3wrpvvbaf0v3z74i"; + version = "1.1.0.0"; + sha256 = "06540l3rylgpdhfdvd9nwkf6v8hyky4l3igs45zblrmhz4sdql5i"; libraryHaskellDepends = [ - base bytestring lens pcre-heavy template-haskell text + base bytestring containers lens pcre-heavy pcre-light + template-haskell text ]; testHaskellDepends = [ - base bytestring hspec lens pcre-heavy template-haskell text + base bytestring containers hspec lens pcre-heavy pcre-light + template-haskell text ]; benchmarkHaskellDepends = [ - base bytestring gauge lens pcre-heavy template-haskell text + base bytestring containers gauge lens pcre-heavy pcre-light + template-haskell text ]; description = "A lensy interface to regular expressions"; license = stdenv.lib.licenses.bsd3; @@ -178247,19 +178250,20 @@ self: { "pandoc-placetable" = callPackage ({ mkDerivation, aeson, base, bytestring, explicit-exception - , http-conduit, pandoc-types, spreadsheet, text, utf8-string + , http-conduit, pandoc, pandoc-types, spreadsheet, text + , utf8-string }: mkDerivation { pname = "pandoc-placetable"; version = "0.5.1"; sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; - configureFlags = [ "-finlineMarkdown" ]; + configureFlags = [ "-finlinemarkdown" ]; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - aeson base bytestring explicit-exception http-conduit pandoc-types - spreadsheet text utf8-string + aeson base bytestring explicit-exception http-conduit pandoc + pandoc-types spreadsheet text utf8-string ]; description = "Pandoc filter to include CSV files"; license = "GPL"; @@ -198451,7 +198455,7 @@ self: { pname = "reactive-banana-wx"; version = "1.1.1.0"; sha256 = "1yzymc6qpjj8d0fal09vxy2yicbrgrg42khylbbsrzmdgqfnf3kr"; - configureFlags = [ "-f-buildExamples" ]; + configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true;