diff options
Diffstat (limited to 'pkgs/development')
192 files changed, 5021 insertions, 2611 deletions
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index be65061c544..bb57ebbfa87 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -1,4 +1,5 @@ {stdenv, fetchurl +, libtool, autoconf, automake , gmp, mpfr, libffi , noUnicode ? false, }: @@ -13,10 +14,10 @@ let sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid"; }; buildInputs = [ - libffi + libtool autoconf automake ]; propagatedBuildInputs = [ - gmp mpfr + libffi gmp mpfr ]; in stdenv.mkDerivation { @@ -25,8 +26,18 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + patches = [ ./libffi-prefix.patch ]; + preConfigure = '' + (cd src ; libtoolize -f) + (cd src ; autoheader -f) + (cd src ; aclocal) + (cd src ; automake --add-missing -c) + (cd src ; autoconf -f) + ''; configureFlags = [ "--enable-threads" + "--with-gmp-prefix=${gmp}" + "--with-libffi-prefix=${libffi}" ] ++ (stdenv.lib.optional (! noUnicode) diff --git a/pkgs/development/compilers/ecl/libffi-prefix.patch b/pkgs/development/compilers/ecl/libffi-prefix.patch new file mode 100644 index 00000000000..d02cc214f31 --- /dev/null +++ b/pkgs/development/compilers/ecl/libffi-prefix.patch @@ -0,0 +1,39 @@ +diff --git a/src/configure.in b/src/configure.in +index 434da49..642c66c 100644 +--- ecl-15.3.7.orig/src/configure.ac ++++ ecl-15.3.7/src/configure.ac +@@ -191,6 +191,11 @@ AC_ARG_WITH(dffi, + [(system|included|auto|no, default=AUTO if libffi available)]), + [enable_libffi=${withval}], [enable_libffi=auto]) + ++AC_ARG_WITH(libffi-prefix, ++ AS_HELP_STRING( [--with-libffi-prefix=path], ++ [prefix for system LIBFFI includes and libraries] ), ++ [LIBFFI_INCDIR="$withval/include"; LIBFFI_LIBDIR="$withval/lib"], []) ++ + AC_ARG_WITH(fpe, + AS_HELP_STRING( [--with-fpe], + [detect floating point exceptions] +@@ -368,6 +373,22 @@ else + INFOEXT=info + fi + ++dnl libffi ++ ++if test "x$LIBFFI_INCDIR" != "x"; then ++ LIBFFI_CPPFLAGS="-I$LIBFFI_INCDIR" ++fi ++if test "x$LIBFFI_LIBDIR" != "x"; then ++ LIBFFI_LDFLAGS="-L$LIBFFI_LIBDIR" ++ if test "$enable_rpath" = "yes"; then ++ if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then ++ LIBFFI_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBFFI_LIBDIR,"`" $LIBFFI_LDFLAGS" ++ fi ++ fi ++fi ++CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS" ++LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS" ++ + dnl ====================================================================== + dnl GNU multiprecision library + dnl diff --git a/pkgs/development/compilers/gcc/3.4/default.nix b/pkgs/development/compilers/gcc/3.4/default.nix index 1595b7f336f..1be771ac705 100644 --- a/pkgs/development/compilers/gcc/3.4/default.nix +++ b/pkgs/development/compilers/gcc/3.4/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { } "; - passthru = { inherit langC langCC langF77; }; + passthru = { inherit langC langCC langF77; isGNU = true; }; meta = { homepage = "http://gcc.gnu.org/"; diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 45040c2f375..3db8ee5f3ea 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -171,6 +171,8 @@ stdenv.mkDerivation ({ rm -Rf ghdl-* ''; + passthru.isGNU = true; + meta = { homepage = "http://ghdl.free.fr/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index c78de2265f3..47c8c86a95d 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -243,7 +243,7 @@ stdenv.mkDerivation ({ passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; # ghdl does not build fine with parallel building # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46173 diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index 931c5c413de..c4be4f266dd 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -358,7 +358,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - enableMultilib version; }; + enableMultilib version; isGNU = true; }; enableParallelBuilding = !langAda; diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 78666c8cdce..0f65a89bd20 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -427,7 +427,7 @@ stdenv.mkDerivation ({ else null; passthru = { inherit langC langCC langAda langFortran langVhdl - langGo version; }; + langGo version; isGNU = true; }; enableParallelBuilding = false; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 86d4aa30267..0958ce7b1c9 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -15,10 +15,12 @@ , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null +, gtk ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null +, x11Support ? langJava , gnatboot ? null , enableMultilib ? false , enablePlugin ? true # whether to support user-supplied plug-ins @@ -91,7 +93,7 @@ let version = "4.8.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && x11Support; /* Platform flags */ platformFlags = let @@ -200,7 +202,7 @@ let version = "4.8.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index ee7ca20ddf7..d8157673fbc 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 2364fe1d5b9..f6beaf3a006 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index b3371eb920b..a1cdd6171ee 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -116,5 +116,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index 9e61be7b47f..c28359af16f 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - broken = stdenv.isDarwin; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is not supported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix index 09d89b80f34..5bec1fa3f55 100644 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ b/pkgs/development/compilers/ghc/7.10.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }: +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }: let @@ -13,21 +13,34 @@ let ''} ''; + # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 + # This should be removed when GHC includes Cabal > 1.22.2.0 + cabalPatch = fetchpatch { + url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch; + sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb"; + }; + in stdenv.mkDerivation rec { - version = "7.10.0.20150316"; + version = "7.10.1"; name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1-rc3/${name}-src.tar.bz2"; - sha256 = "0cqazqf90rsp2nl7pk46gki7lln9jks0h166i0bd1qsp5gc1xv13"; + url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; + sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; }; buildInputs = [ ghc perl ]; enableParallelBuilding = true; + postPatch = '' + pushd libraries/Cabal + patch -p1 < ${cabalPatch} + popd + ''; + preConfigure = '' echo >mk/build.mk "${buildMK}" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 778b47afde7..651cf200a8d 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - broken = stdenv.isDarwin; maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.andres stdenv.lib.maintainers.simons ]; - inherit (ghc.meta) license platforms; + platforms = ["x86_64-linux" "i686-linux"]; # Darwin is unsupported. + inherit (ghc.meta) license; }; } diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 4bf7d6d3531..2b8d403701f 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -124,5 +124,5 @@ stdenv.mkDerivation rec { ''; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "i686-darwin" "x86_64-darwin"]; + meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix index c4000fc86c2..5497b35ec1d 100644 --- a/pkgs/development/compilers/ghc/7.8.4.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -38,15 +38,11 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - meta = with stdenv.lib; { + meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; - inherit (ghc.meta) license; - # Filter old "i686-darwin" platform which is unsupported these days. - platforms = filter (x: elem x platforms.all) ghc.meta.platforms; - # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>. - hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; + inherit (ghc.meta) license platforms; }; } diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 4cde21dbcc2..45bb4342088 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150118"; + version = "7.11.20150402"; name = "ghc-${version}"; - rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4"; + rev = "47f821a1a24553dc29b9581b1a259a9b1394c955"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6"; + sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj"; }; postUnpack = '' diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index e6798be78f8..d04bd842bf6 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -1,64 +1,91 @@ -{ nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time -, zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable -, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative -, parallel, safe, shelly, split, stringsearch, syb, systemFileio -, systemFilepath, tar, terminfo, textBinary, unorderedContainers -, vector, wlPprintText, yaml, fetchgit, Cabal, cabalInstall -, regexPosix, alex, happy, git, gnumake, gcc, autoconf, patch -, automake, libtool, gmp, base16Bytestring -, cryptohash, executablePath, transformersCompat, haddockApi -, haddock, hspec, xhtml, primitive, cacert, pkgs, ghc +{ mkDerivation +, test-framework +, test-framework-hunit +, test-framework-quickcheck2 +, data-default +, ghc-paths +, haskell-src-exts +, haskell-src-meta +, optparse-applicative +, system-fileio +, system-filepath +, text-binary +, unordered-containers +, cabal-install +, wl-pprint-text +, base16-bytestring +, executable-path +, transformers-compat +, haddock-api +, ghcjs-prim +, regex-posix + +, ghc, gmp +, jailbreak-cabal + +, nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm +, time +, zlib, aeson, attoparsec, bzlib, hashable +, lens +, parallel, safe, shelly, split, stringsearch, syb +, tar, terminfo +, vector, yaml, fetchgit, Cabal +, alex, happy, git, gnumake, autoconf, patch +, automake, libtool +, cryptohash +, haddock, hspec, xhtml, primitive, cacert, pkgs , coreutils -, ghcjsPrim +, libiconv }: let version = "0.1.0"; - libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.ghc.version}/ghcjs"; + libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.version}/ghcjs"; ghcjsBoot = fetchgit { url = git://github.com/ghcjs/ghcjs-boot.git; - rev = "5c7a71472d5a797e895914d3b82cea447a058793"; - sha256 = "0dp97bgbnlr3sd9yfnk27p6dfv46fi26sn6y6qv1wxs5i29kmjav"; + rev = "8cd6144870470258fb037b3e04a0a2a98c2b6551"; # 7.10 branch + sha256 = "16cbncx179n5khf8hkj9r221wf73rc8isffk8rv3n9psshv1jiji"; fetchSubmodules = true; }; shims = fetchgit { url = git://github.com/ghcjs/shims.git; - rev = "99bbd4bed584ec42bfcc5ea61c3808a2c670053d"; - sha256 = "1my3gqkln7hgm0bpy32pnhwjfza096alh0n9x9ny8xfpxhmzz4h6"; + rev = "6ada4bf1a084d1b80b993303d35ed863d219b031"; # master branch + sha256 = "0dhfnjj3rxdbb2m1pbnjc2yp4xcgsfdrsinljgdmg0hpqkafp4vc"; }; -in cabal.mkDerivation (self: rec { +in mkDerivation (rec { pname = "ghcjs"; inherit version; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "4b9461e8be646d5152a0ae7ece5b3616bf938637"; - sha256 = "19g62j1kkdwcgp0042ppmskwbvfk7qkf1fjs8bpjc6wwd19ipiar"; + rev = "35a59743c4027f26a227635cb24a6246bd851f8d"; # master branch + sha256 = "107sh36ji3psdl3py84vxgqbywjyzglj3p0akzpvcmbarxwfr1mw"; }; isLibrary = true; isExecutable = true; jailbreak = true; - noHaddock = true; + doHaddock = false; doCheck = false; buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec - bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta - lens optparseApplicative parallel safe shelly split - stringsearch syb systemFileio systemFilepath tar terminfo textBinary - unorderedContainers vector wlPprintText yaml - alex happy git gnumake gcc autoconf automake libtool patch gmp - base16Bytestring cryptohash executablePath haddockApi - transformersCompat QuickCheck haddock hspec xhtml - ghcjsPrim regexPosix + bzlib data-default ghc-paths hashable haskell-src-exts haskell-src-meta + lens optparse-applicative parallel safe shelly split + stringsearch syb system-fileio system-filepath tar terminfo text-binary + unordered-containers vector wl-pprint-text yaml + alex happy git gnumake autoconf automake libtool patch gmp + base16-bytestring cryptohash executable-path haddock-api + transformers-compat QuickCheck haddock hspec xhtml + ghcjs-prim regex-posix libiconv ]; buildTools = [ nodejs git ]; testDepends = [ - HUnit testFramework testFrameworkHunit + HUnit test-framework test-framework-hunit ]; patches = [ ./ghcjs.patch ]; postPatch = '' substituteInPlace Setup.hs --replace "/usr/bin/env" "${coreutils}/bin/env" substituteInPlace src/Compiler/Info.hs --replace "@PREFIX@" "$out" - substituteInPlace src-bin/Boot.hs --replace "@PREFIX@" "$out" + substituteInPlace src-bin/Boot.hs \ + --replace "@PREFIX@" "$out" \ + --replace "@CC@" "${stdenv.cc}/bin/cc" ''; preBuild = '' local topDir=$out/${libDir} @@ -69,23 +96,33 @@ in cabal.mkDerivation (self: rec { cp -r ${shims} $topDir/shims chmod -R u+w $topDir/shims + + # Make the patches be relative their corresponding package's directory. + # See: https://github.com/ghcjs/ghcjs-boot/pull/12 + for patch in $topDir/ghcjs-boot/patches/*.patch; do + echo "fixing patch: $patch" + sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch + done ''; postInstall = '' - PATH=$out/bin:${Cabal}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.cc}/lib64:$LD_LIBRARY_PATH \ + PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \ env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \ --dev \ - --with-cabal ${cabalInstall}/bin/cabal \ + --with-cabal ${cabal-install}/bin/cabal \ --with-gmp-includes ${gmp}/include \ --with-gmp-libraries ${gmp}/lib ''; passthru = { inherit libDir; + isGhcjs = true; + nativeGhc = ghc; }; - meta = { - homepage = "https://github.com/ghcjs/ghcjs"; - description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.jwiegley ]; - }; + + homepage = "https://github.com/ghcjs/ghcjs"; + description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API"; + license = stdenv.lib.licenses.bsd3; + platforms = ghc.meta.platforms; + maintainers = with stdenv.lib.maintainers; [ + jwiegley cstrahan + ]; }) diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch index 92f67fb7212..618656f787c 100644 --- a/pkgs/development/compilers/ghcjs/ghcjs.patch +++ b/pkgs/development/compilers/ghcjs/ghcjs.patch @@ -1,5 +1,5 @@ diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs -index 988955b..a55f07b 100644 +index 3c68dcf..64f3cf7 100644 --- a/src-bin/Boot.hs +++ b/src-bin/Boot.hs @@ -512,9 +512,7 @@ initPackageDB :: B () @@ -46,9 +46,11 @@ index 988955b..a55f07b 100644 mapM_ patchPackage =<< allPackages preparePrimops buildGenPrim -@@ -1086,7 +1077,9 @@ cabalInstallFlags parmakeGhcjs = do +@@ -1085,8 +1076,11 @@ cabalInstallFlags parmakeGhcjs = do + , "--avoid-reinstalls" , "--builddir", "dist" , "--with-compiler", ghcjs ^. pgmLocText ++ , "--with-gcc", "@CC@" , "--with-hc-pkg", ghcjsPkg ^. pgmLocText - , "--prefix", toTextI instDir + , "--prefix", "@PREFIX@" diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix new file mode 100644 index 00000000000..5d9ca621648 --- /dev/null +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, +gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: + +assert emacsSupport -> (emacs != null); + +let # The gnu-smalltalk project has a dependency to the libsigsegv library. + # The project ships with sources for this library, but deprecated this option. + # Using the vanilla libsigsegv library results in error: "cannot relocate [...]" + # Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags + # does not help, the error still occurs. The only solution is to build a + # shared version of libsigsegv. + libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: { + configureFlags = [ "--enable-shared" ]; + }); + +in stdenv.mkDerivation rec { + + version = "3.2.5"; + name = "gnu-smalltalk-${version}"; + + src = fetchurl { + url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz"; + sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1"; + }; + + # The dependencies and their justification are explained at + # http://smalltalk.gnu.org/download + buildInputs = [ + pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk + cairo SDL sqlite + ] + ++ stdenv.lib.optional emacsSupport emacs; + + configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs"; + + installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp"; + + # For some reason the tests fail if executated with nix-build, but pass if + # executed within nix-shell --pure. + doCheck = false; + + meta = with stdenv.lib; { + description = "A free implementation of the Smalltalk-80 language"; + longDescription = '' + GNU Smalltalk is a free implementation of the Smalltalk-80 language. It + runs on most POSIX compatible operating systems (including GNU/Linux, of + course), as well as under Windows. Smalltalk is a dynamic object-oriented + language, well-versed to scripting tasks. + ''; + homepage = http://smalltalk.gnu.org/; + license = with licenses; [ gpl2 lgpl2 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ skeidel ]; + }; +} diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index e38c37360f0..72bdabb4349 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gmp libyaml libedit libvpx imagemagick fribidi ]; - enableParallelBuilding = true; + enableParallelBuilding = false; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index aeaa476df12..316730fe3ba 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -29,7 +29,11 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { cc = stdenv.cc.cc; }; + passthru = { + isClang = true; + cc = stdenv.cc.cc; + gcc = gccReal; + }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 612e63eafd4..cd060e3a65d 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -34,7 +34,13 @@ stdenv.mkDerivation { ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; - passthru.cc = stdenv.cc.cc; + passthru = { + isClang = true; + cc = stdenv.cc.cc; + # GCC_INSTALL_PREFIX points here, so just use it even though it may not + # actually be a gcc + gcc = stdenv.cc.cc; + }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.4/dragonegg.nix b/pkgs/development/compilers/llvm/3.4/dragonegg.nix index 8704d996424..2ebdc10654b 100644 --- a/pkgs/development/compilers/llvm/3.4/dragonegg.nix +++ b/pkgs/development/compilers/llvm/3.4/dragonegg.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric shlevy]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 93e0056fb92..2398b0c59ac 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -39,7 +39,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + passthru = { + isClang = true; + } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index 2216dad3ef8..7be535ada1e 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -40,7 +40,9 @@ in stdenv.mkDerivation { enableParallelBuilding = true; - passthru = stdenv.lib.optionalAttrs stdenv.isLinux { + passthru = { + isClang = true; + } // stdenv.lib.optionalAttrs stdenv.isLinux { inherit gcc; }; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix new file mode 100644 index 00000000000..2a34a5dc50b --- /dev/null +++ b/pkgs/development/compilers/mkcl/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, gmp }: + +stdenv.mkDerivation rec { + v = "1.1.9"; + name = "mkcl-${v}"; + + src = fetchgit { + url = "https://github.com/jcbeaudoin/mkcl.git"; + rev = "86768cc1dfc2cc9caa1fe9696584bb25ea6c1429"; + sha256 = "0ja7vyp5rjidb2a1gah35jqzqn6zjkikz5sd966p0f0wh26l6n03"; + }; + + propagatedBuildInputs = [ gmp ]; + + configureFlags = [ + "GMP_CFLAGS=-I${gmp}/include" + "GMP_LDFLAGS=-L${gmp}/lib" + ]; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = https://common-lisp.net/project/mkcl/; + license = stdenv.lib.licenses.lgpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} + diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 8137b2a3ab3..a9e0dd89e84 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -6,10 +6,10 @@ let in stdenv.mkDerivation rec { name = "mono-${version}"; - version = "3.8.0"; + version = "3.12.1"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "0jraxsjn7ra6z02n4wjpbj21mxm2w50iqviqvfl0ajikbxahvf3i"; + sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x"; }; buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ]; + maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ]; license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? }; } diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 55b7ff36f8f..d7bcabd0a78 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -37,8 +37,7 @@ let url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; sha256 = "1np8hkg2fmj5s6ipd1vb8x0z6xy00kbi2ipqca9pxzib58caj6b2"; }; -in -stdenv.mkDerivation { + openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn]; outputs = [ "out" "jre" ]; @@ -138,5 +137,6 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.cocreature ]; platforms = stdenv.lib.platforms.linux; }; - -} + + passthru.home = "${openjdk8}/lib/openjdk"; +}; in openjdk8 diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index e6a418c1895..1c1b5d53cee 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix deleted file mode 100644 index 5665fc5da6c..00000000000 --- a/pkgs/development/compilers/qi/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, builderDefs, unzip, clisp }: - let localDefs = builderDefs.passthru.function { - src = /* put a fetchurl here */ - fetchurl { - url = http://www.lambdassociates.org/Download/Qi9.1.zip; - sha256 = "1j584i7pj38rnlf7v9njfdwc6gc296v5friw2887dsw34dmwyg3f"; - }; - buildInputs = [ unzip clisp]; - configureFlags = []; - }; - in with localDefs; -let - shell=stdenv.shell; -in -let - allBuild = fullDepEntry (" - (sleep 0.1; echo ) | clisp install.txt; - (sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp - mkdir -p \$out/share - mkdir -p \$out/bin - cp -r . \$out/share/Qi-9.1 - echo -e '#! ${shell} - arg1=\${1:-'\$out'/share/Qi-9.1/startup.txt} - shift - clisp -M '\$out'/share/Qi-9.1/lispinit.mem \$arg1 \"\$@\"\\n' > \$out/bin/qi - chmod a+x \$out/bin/qi - ") [ addInputs minInit doUnpack defEnsureDir]; -in -stdenv.mkDerivation rec { - name = "Qi-9.1"; - builder = writeScript (name + "-builder") - (textClosure localDefs [allBuild doForceShare doPropagate]); - meta = { - description = "Functional programming language, built top of Common Lisp"; - }; -} diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix index ce3f805bec3..d2b9ec63a73 100644 --- a/pkgs/development/compilers/uhc/default.nix +++ b/pkgs/development/compilers/uhc/default.nix @@ -5,13 +5,13 @@ let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); in stdenv.mkDerivation rec { - version = "1.1.8.7"; + version = "1.1.8.10"; name = "uhc-${version}"; src = fetchgit { url = "https://github.com/UU-ComputerScience/uhc.git"; - rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f"; - sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl"; + rev = "449d9578e06af1362d7f746798f0aed57ab6ca88"; + sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az"; }; postUnpack = "sourceRoot=\${sourceRoot}/EHC"; @@ -41,6 +41,13 @@ in stdenv.mkDerivation rec { homepage = "http://www.cs.uu.nl/wiki/UHC"; description = "Utrecht Haskell Compiler"; maintainers = [ maintainers.phausmann ]; - platforms = stdenv.lib.platforms.unix; + + # UHC i686 support is broken, see + # https://github.com/UU-ComputerScience/uhc/issues/52 + # + # Darwin build is broken as well at the moment. + # On Darwin, the GNU libtool is used, which does not + # support the -static flag and thus breaks the build. + platforms = ["x86_64-linux"]; }; } diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 71271ee7ed8..6d5b49da066 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { '' export CC="${stdenv.cc}/bin/gcc"; export CCARGS="-I$out/include \ - -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; + -L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; export PGHEADER="${postgresql}/include/libpq-fe.h"; - export MSHEADER="${mysql}/include/mysql/mysql.h"; + export MSHEADER="${mysql.lib}/include/mysql/mysql.h"; export SQHEADER="${sqlite}/include/sqlite3.h"; ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a339166fd2d..0601ebdb5c4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -7,8 +7,8 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; - Cabal_1_22_1_1 = dontCheck super.Cabal_1_22_1_1; - cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_1_1; }); + Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0; + cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; }); # Break infinite recursions. digest = super.digest.override { inherit (pkgs) zlib; }; @@ -65,7 +65,25 @@ self: super: { al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL"; # Depends on code distributed under a non-free license. + accelerate-cublas = dontDistribute super.accelerate-cublas; + accelerate-cuda = dontDistribute super.accelerate-cuda; + accelerate-cufft = dontDistribute super.accelerate-cufft; + accelerate-examples = dontDistribute super.accelerate-examples; + accelerate-fft = dontDistribute super.accelerate-fft; + accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark; + AttoJson = markBroken super.AttoJson; bindings-yices = dontDistribute super.bindings-yices; + cublas = dontDistribute super.cublas; + cufft = dontDistribute super.cufft; + gloss-accelerate = dontDistribute super.gloss-accelerate; + gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate; + GoogleTranslate = dontDistribute super.GoogleTranslate; + GoogleDirections = dontDistribute super.GoogleDirections; + libnvvm = dontDistribute super.libnvvm; + manatee-all = dontDistribute super.manatee-all; + manatee-ircclient = dontDistribute super.manatee-ircclient; + Obsidian = dontDistribute super.Obsidian; + patch-image = dontDistribute super.patch-image; yices = dontDistribute super.yices; yices-easy = dontDistribute super.yices-easy; yices-painless = dontDistribute super.yices-painless; @@ -107,6 +125,7 @@ self: super: { deepseq-magic = dontHaddock super.deepseq-magic; diagrams = dontHaddock super.diagrams; either = dontHaddock super.either; + feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1 gl = dontHaddock super.gl; groupoids = dontHaddock super.groupoids; hamlet = dontHaddock super.hamlet; @@ -169,19 +188,20 @@ self: super: { ''; }); - # Does not compile: <http://hydra.cryp.to/build/469842/nixlog/1/raw>. - base_4_7_0_2 = markBroken super.base_4_7_0_2; + # Does not compile: "fatal error: ieee-flpt.h: No such file or directory" + base_4_8_0_0 = markBroken super.base_4_8_0_0; # Obsolete: https://github.com/massysett/prednote/issues/1. prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test; - # Doesn't compile: <http://hydra.cryp.to/build/465891/nixlog/1/raw>. - integer-gmp_0_5_1_0 = markBroken super.integer-gmp_0_5_1_0; + # Doesn't compile: "Setup: can't find include file ghc-gmp.h" + integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0; + # Obsolete. lushtags = markBrokenVersion "0.0.1" super.lushtags; # https://github.com/haskell/bytestring/issues/41 - bytestring_0_10_4_1 = dontCheck super.bytestring_0_10_4_1; + bytestring_0_10_6_0 = dontCheck super.bytestring_0_10_6_0; # https://github.com/zmthy/http-media/issues/6 http-media = dontCheck super.http-media; @@ -196,6 +216,13 @@ self: super: { glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk]; + gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; + + # Need WebkitGTK, not just webkit. + webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; }; + webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; + webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; + websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; }; # https://github.com/jgm/zip-archive/issues/21 zip-archive = addBuildTool super.zip-archive pkgs.zip; @@ -236,6 +263,7 @@ self: super: { hakyll = dontCheck super.hakyll; Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; + marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 memcached-binary = dontCheck super.memcached-binary; persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; @@ -253,6 +281,7 @@ self: super: { amqp-conduit = dontCheck super.amqp-conduit; concurrent-dns-cache = dontCheck super.concurrent-dns-cache; dbus = dontCheck super.dbus; # http://hydra.cryp.to/build/498404/log/raw + directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; # https://github.com/haskell/directory/issues/24 hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); @@ -300,6 +329,7 @@ self: super: { cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw + CLI = dontCheck super.CLI; # Upstream has no issue tracker. cjk = dontCheck super.cjk; command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw conduit-connection = dontCheck super.conduit-connection; @@ -427,15 +457,26 @@ self: super: { # https://github.com/bos/snappy/issues/1 snappy = dontCheck super.snappy; - # Needs llvm to compile. - bytestring-arbitrary = addBuildTool super.bytestring-arbitrary pkgs.llvm_34; - # Expect to find sendmail(1) in $PATH. mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\""; # Help the test suite find system timezone data. tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; }); + # Deprecated upstream and doesn't compile. + BASIC = dontDistribute super.BASIC; + bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm); + llvm = dontDistribute super.llvm; + llvm-base = markBroken super.llvm-base; + llvm-base-util = dontDistribute super.llvm-base-util; + llvm-extra = dontDistribute super.llvm-extra; + llvm-tf = dontDistribute super.llvm-tf; + objectid = dontDistribute super.objectid; + saltine-quickcheck = dontDistribute super.saltine-quickcheck; + stable-tree = dontDistribute super.stable-tree; + synthesizer-llvm = dontDistribute super.synthesizer-llvm; + optimal-blocks = dontDistribute super.optimal-blocks; + # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; @@ -482,11 +523,6 @@ self: super: { # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44 liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; }); - # LLVM 3.5 breaks GHC: https://ghc.haskell.org/trac/ghc/ticket/9142. - GlomeVec = super.GlomeVec.override { llvm = pkgs.llvm_34; }; # https://github.com/jimsnow/glome/issues/2 - gloss-raster = super.gloss-raster.override { llvm = pkgs.llvm_34; }; - repa-examples = super.repa-examples.override { llvm = pkgs.llvm_34; }; - # Missing module. rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5 rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6 @@ -579,15 +615,8 @@ self: super: { # Build fails, but there seems to be no issue tracker available. :-( hmidi = markBrokenVersion "0.2.1.0" super.hmidi; padKONTROL = markBroken super.padKONTROL; - - # https://github.com/lambdabot/lambdabot/issues/105 - lambdabot-core = markBroken super.lambdabot-core; - lambdabot-haskell-plugins = markBroken super.lambdabot-haskell-plugins; - lambdabot-irc-plugins = markBroken super.lambdabot-irc-plugins; - lambdabot-misc-plugins = markBroken super.lambdabot-misc-plugins; - lambdabot-novelty-plugins = markBroken super.lambdabot-novelty-plugins; - lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins; - lambdabot-social-plugins = markBroken super.lambdabot-social-plugins; + Bang = dontDistribute super.Bang; + launchpad-control = dontDistribute super.launchpad-control; # Upstream provides no issue tracker and no contact details. vivid = markBroken super.vivid; @@ -595,6 +624,12 @@ self: super: { # Test suite wants to connect to $DISPLAY. hsqml = dontCheck super.hsqml; + # https://github.com/lookunder/RedmineHs/issues/4 + Redmine = markBroken super.Redmine; + + # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence) + unlambda = dontHyperlinkSource super.unlambda; + # https://github.com/megantti/rtorrent-rpc/issues/1 rtorrent-rpc = markBroken super.rtorrent-rpc; @@ -607,6 +642,9 @@ self: super: { # https://github.com/junjihashimoto/test-sandbox-compose/issues/2 test-sandbox-compose = dontCheck super.test-sandbox-compose; + # https://github.com/jgm/pandoc/issues/2045 + pandoc = dontCheck super.pandoc; + # Broken by GLUT update. Monadius = markBroken super.Monadius; @@ -614,10 +652,6 @@ self: super: { haroonga = markBroken super.haroonga; haroonga-httpd = markBroken super.haroonga-httpd; - # Cannot find pkg-config data for "webkit-1.0". - webkit = markBroken super.webkit; - websnap = markBroken super.websnap; - # Build is broken and no contact info available. hopenpgp-tools = markBroken super.hopenpgp-tools; @@ -637,16 +671,60 @@ self: super: { hydrogen-syntax = markBroken super.hydrogen-syntax; hydrogen-cli = dontDistribute super.hydrogen-cli; + # https://github.com/meteficha/Hipmunk/issues/8 + Hipmunk = markBroken super.Hipmunk; + HipmunkPlayground = dontDistribute super.HipmunkPlayground; + click-clack = dontDistribute super.click-clack; + + # https://github.com/prowdsponsor/esqueleto/issues/93 + esqueleto = dontCheck super.esqueleto; + + # https://github.com/anchor/ceilometer-common/issues/16 + ceilometer-common = dontCheck super.ceilometer-common; + + # https://github.com/fumieval/audiovisual/issues/1 + audiovisual = markBroken super.audiovisual; + + # https://github.com/alephcloud/hs-stm-queue-extras/issues/2 + stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; }); + + # https://github.com/GaloisInc/cryptol/issues/197 + cryptol = overrideCabal super.cryptol (drv: { + postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs"; + }); + + # https://github.com/haskell/haddock/issues/378 + haddock-library = dontCheck super.haddock-library; + + # Already fixed in upstream darcs repo. + xmonad-contrib = overrideCabal super.xmonad-contrib (drv: { + patchPhase = '' + sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs + sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs + ''; + }); + + # https://github.com/anton-k/csound-expression-dynamic/issues/1 + csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; + + # Hardcoded include path + poppler = overrideCabal super.poppler (drv: { + patchPhase = '' + sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal + sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc + ''; + }); + } // { # Not on Hackage. cabal2nix = self.mkDerivation { pname = "cabal2nix"; - version = "20150310"; + version = "20150318"; src = pkgs.fetchgit { url = "http://github.com/NixOS/cabal2nix.git"; - rev = "267d0495209822ad819b58cb472a0da54f5a0b72"; - sha256 = "1sdsjwf1cda4bpriiv1vfx0pa26087hzw7vviacvgbmn0xh6wm8g"; + rev = "b56cc6de2c4900fb0d1dc3617591a2f536aca60d"; + sha256 = "0pza9j3x1mfjqrzcqq6ndg0jiqx85mg0sw8n9fmq18fk5g4hzhis"; deepClone = true; }; isLibrary = false; diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index cccf5833c8a..2a5213d4e12 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # LLVM is not supported on this GHC; use the latest one. + inherit (pkgs) llvmPackages; + # Disable GHC 6.12.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 36afb31ffcd..27c4b642c4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.0.x core libraries. array = null; base = null; @@ -35,7 +38,7 @@ self: super: { binary = self.binary_0_7_4_0; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_0; + deepseq = self.deepseq_1_4_1_1; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index df44501aadd..fb58da83f34 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_35; + # Disable GHC 7.10.x core libraries. array = null; base = null; @@ -30,6 +33,9 @@ self: super: { unix = null; xhtml = null; + # Cabal_1_22_1_1 requires filepath >=1 && <1.4 + cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); + # We have Cabal 1.22.x. jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; @@ -52,6 +58,9 @@ self: super: { # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; + # requires filepath >=1.1 && <1.4 + Glob = doJailbreak super.Glob; + # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; @@ -80,19 +89,47 @@ self: super: { # Test suite fails in "/tokens_bytestring_unicode.g.bin". alex = dontCheck super.alex; + # TODO: should eventually update the versions in hackage-packages.nix + haddock-library = overrideCabal super.haddock-library (drv: { + version = "1.2.0"; + sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; + }); + haddock-api = overrideCabal super.haddock-api (drv: { + version = "2.16.0"; + sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj"; + }); + haddock = overrideCabal super.haddock (drv: { + version = "2.16.0"; + sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa"; + }); + # Upstream was notified about the over-specified constraint on 'base' # but refused to do anything about it because he "doesn't want to # support a moving target". Go figure. barecheck = doJailbreak super.barecheck; - cartel = overrideCabal super.cartel (drv: { doCheck = false; patchPhase = "sed -i -e 's|base >= .*|base|' cartel.cabal"; }); + + syb-with-class = appendPatch super.syb-with-class (pkgs.fetchpatch { + url = "https://github.com/seereason/syb-with-class/compare/adc86a9...719e567.patch"; + sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br"; + }); + + wl-pprint = overrideCabal super.wl-pprint (drv: { + patchPhase = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs"; + }); + + wl-pprint-text = overrideCabal super.wl-pprint-text (drv: { + patchPhase = '' + sed -i '71iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text/Monadic.hs + sed -i '119iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen/Text.hs + ''; + }); # https://github.com/kazu-yamamoto/unix-time/issues/30 unix-time = dontCheck super.unix-time; # Until the changes have been pushed to Hackage - haskell-src-meta = appendPatch super.haskell-src-meta (pkgs.fetchpatch { - url = "https://github.com/bmillwood/haskell-src-meta/pull/31.patch"; - sha256 = "0ij5zi2sszqns46mhfb87fzrgn5lkdv8yf9iax7cbrxb4a2j4y1w"; + haskell-src-meta = overrideCabal (doJailbreak (appendPatch super.haskell-src-meta ./haskell-src-meta-ghc710.patch)) (drv: { + prePatch = "sed -i -e 's|template-haskell [^,]\\+|template-haskell|' haskell-src-meta.cabal && cat haskell-src-meta.cabal"; }); foldl = appendPatch super.foldl (pkgs.fetchpatch { url = "https://github.com/Gabriel439/Haskell-Foldl-Library/pull/30.patch"; @@ -103,10 +140,6 @@ self: super: { sha256 = "1gphl0v87y2fjwkwp6j0bnksd0d9dr4pis6aw97rij477bm5mrvw"; stripLen = 1; }); - stringsearch = appendPatch super.stringsearch (pkgs.fetchpatch { - url = "https://bitbucket.org/api/2.0/repositories/dafis/stringsearch/pullrequests/3/patch"; - sha256 = "13n7wipaa1j2rghg2j68yjnda8a5galpv5sfz4j4d9509xakz25g"; - }); mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { url = "https://github.com/snoyberg/mono-traversable/pull/68.patch"; sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h"; @@ -126,9 +159,15 @@ self: super: { stripLen = 1; }); - # https://github.com/batterseapower/ansi-wl-pprint/issues/13 - ansi-wl-pprint = appendPatch super.ansi-wl-pprint (pkgs.fetchpatch { - url = "https://github.com/hvr/ansi-wl-pprint/commit/7e489ea6b546899074b1cdccf37d2e49ab313098.patch"; - sha256 = "0j20cwbph1wg82gfad5a6gfc5gy42cf4vz514jrpfg8d9qvyfhlj"; - }); + ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { + pname = "ghcjs-prim"; + version = "0.1.0.0"; + src = fetchgit { + url = git://github.com/ghcjs/ghcjs-prim.git; + rev = "ca08e46257dc276e01d08fb47a693024bae001fa"; # ghc-7.10 branch + sha256 = "0w7sqzp5p70yhmdhqasgkqbf3b61wb24djlavwil2j8ry9y472w3"; + }; + buildDepends = [ primitive ]; + license = pkgs.stdenv.lib.licenses.bsd3; + }) {}; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 23e939853af..8428af7ca6e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.2.x core libraries. array = null; base = null; @@ -32,7 +35,7 @@ self: super: { unix = null; # deepseq is not a core library for this compiler. - deepseq = self.deepseq_1_4_1_0; + deepseq = self.deepseq_1_4_1_1; # transformers is not a core library for this compiler. transformers = self.transformers_0_4_3_0; @@ -40,7 +43,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index 0188be27a65..fd4109fad72 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.4.x core libraries. array = null; base = null; @@ -37,7 +40,7 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 827ea9895e6..5285484d2ff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.6.x core libraries. array = null; base = null; @@ -36,11 +39,11 @@ self: super: { transformers-compat = disableCabalFlag super.transformers-compat "three"; # haskeline and terminfo are not core libraries for this compiler. - haskeline = self.haskeline_0_7_2_0; + haskeline = self.haskeline_0_7_2_1; terminfo = self.terminfo_0_4_0_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_1_1 = super.Cabal_1_22_1_1.override { binary = self.binary_0_7_4_0; }; + Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; }; # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; @@ -67,30 +70,7 @@ self: super: { contravariant = addBuildDepend super.contravariant self.tagged; reflection = dontHaddock (addBuildDepend super.reflection self.tagged); -} // { - - # Not on Hackage. - cryptol = self.mkDerivation rec { - pname = "cryptol"; - version = "2.1.0"; - src = pkgs.fetchFromGitHub { - owner = "GaloisInc"; - repo = "cryptol"; - rev = "v${version}"; - sha256 = "00bmad3qc7h47j26xp7hbrlb0qv0f7k9spxgsc1f6lsmpgq9axr3"; - }; - isLibrary = true; - isExecutable = true; - buildDepends = with self; [ - ansi-terminal array async base containers deepseq directory - executable-path filepath GraphSCC haskeline monadLib mtl old-time - presburger pretty process QuickCheck random smtLib syb text - tf-random transformers utf8-string - ]; - buildTools = with self; [ alex happy Cabal_1_22_1_1 ]; - patchPhase = "sed -i -e 's|process .*,|process,|' cryptol.cabal"; - description = "Cryptol: The Language of Cryptography"; - license = pkgs.stdenv.lib.licenses.bsd3; - }; + # The compat library is empty in the presence of mtl 2.2.x. + mtl-compat = dontHaddock super.mtl-compat; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 96447d9d90b..b0203b79bc2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Suitable LLVM version. + llvmPackages = pkgs.llvmPackages_34; + # Disable GHC 7.8.x core libraries. array = null; base = null; @@ -40,20 +43,25 @@ self: super: { # Configure build for mtl 2.1.x. mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat; + # haddock-api 2.16 requires ghc>=7.10 + haddock-api = super.haddock-api_2_15_0_2; + # Idris requires mtl 2.2.x. idris = overrideCabal (super.idris.overrideScope (self: super: { mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; }); + blaze-markup = self.blaze-markup_0_6_2_0; + blaze-html = self.blaze-html_0_7_0_3; + haskeline = self.haskeline_0_7_2_1; + lens = self.lens_4_7; + mtl = super.mtl_2_2_1; transformers = super.transformers_0_4_3_0; transformers-compat = disableCabalFlag super.transformers-compat "three"; - haskeline = self.haskeline_0_7_2_0; - mtl = super.mtl_2_2_1; })) (drv: { - jailbreak = true; # idris is scared of lens 4.7 patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +"; }); # warning: "Module ‘Control.Monad.Error’ is deprecated" # Depends on time == 0.1.5, which we don't have. - HStringTemplate_0_8_1 = dontDistribute super.HStringTemplate_0_8_1; + HStringTemplate_0_8_3 = dontDistribute super.HStringTemplate_0_8_3; # This is part of bytestring in our compiler. bytestring-builder = dontHaddock super.bytestring-builder; @@ -68,7 +76,9 @@ self: super: { command-qq = dontCheck super.command-qq; # Doesn't support GHC < 7.10.x. + bound-gen = dontDistribute super.bound-gen; ghc-exactprint = dontDistribute super.ghc-exactprint; + ghc-typelits-natnormalise = dontDistribute super.ghc-typelits-natnormalise; # Newer versions require transformers 0.4.x. seqid = super.seqid_0_1_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 4c4065e8889..47b450afc4e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -4,6 +4,9 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + # Disable GHC 7.11.x core libraries. array = null; base = null; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 000a0647bef..aad0da0604e 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -4,6 +4,15 @@ with import ./lib.nix { inherit pkgs; }; self: super: { + # LLVM is not supported on this GHC; use the latest one. + inherit (pkgs) llvmPackages; + + jailbreak-cabal = pkgs.haskell-ng.packages.ghc7101.jailbreak-cabal; + + # Many packages fail with: + # haddock: internal error: expectJust getPackageDetails + mkDerivation = drv: super.mkDerivation (drv // { doHaddock = false; }); + # This is the list of packages that are built into a booted ghcjs installation # It can be generated with the command: # nix-shell '<nixpkgs>' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" @@ -16,21 +25,21 @@ self: super: { binary = null; rts = null; bytestring = null; - caseInsensitive = null; + case-insensitive = null; containers = null; deepseq = null; directory = null; dlist = null; - extensibleExceptions = null; + extensible-exceptions = null; filepath = null; - ghcPrim = null; - ghcjsBase = null; - ghcjsPrim = null; + ghc-prim = null; + ghcjs-base = null; + ghcjs-prim = null; hashable = null; - integerGmp = null; + integer-gmp = null; mtl = null; - oldLocale = null; - oldTime = null; + old-locale = null; + old-time = null; parallel = null; pretty = null; primitive = null; @@ -38,12 +47,64 @@ self: super: { scientific = null; stm = null; syb = null; - templateHaskell = null; + template-haskell = null; text = null; time = null; transformers = null; unix = null; - unorderedContainers = null; + unordered-containers = null; vector = null; + pqueue = overrideCabal super.pqueue (drv: { + patchPhase = '' + sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs + sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs + sed -i -e '32s|null|Data.PQueue.Max.null|' Data/PQueue/Max.hs + sed -i -e '42s|null|Data.PQueue.Prio.Internals.null|' Data/PQueue/Prio/Min.hs + sed -i -e '42s|null|Data.PQueue.Prio.Max.null|' Data/PQueue/Prio/Max.hs + ''; + }); + + reactive-banana = overrideCabal super.reactive-banana (drv: { + patchPhase = '' + cat >> src/Reactive/Banana/Switch.hs <<EOF + instance Functor (AnyMoment Identity) where + fmap = liftM + + instance Applicative (AnyMoment Identity) where + pure = return + (<*>) = ap + EOF + ''; + }); + + transformers-compat = overrideCabal super.transformers-compat (drv: { + configureFlags = []; + }); + + dependent-map = overrideCabal super.dependent-map (drv: { + preConfigure = '' + sed -i 's/^.*trust base.*$//' *.cabal + ''; + }); + + profunctors = overrideCabal super.profunctors (drv: { + preConfigure = '' + sed -i 's/^{-# ANN .* #-}//' src/Data/Profunctor/Unsafe.hs + ''; + }); + + "ghcjs-dom" = self.callPackage + ({ mkDerivation, base, mtl, text, ghcjs-base + }: + mkDerivation { + pname = "ghcjs-dom"; + version = "0.1.1.3"; + sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; + buildDepends = [ base mtl text ghcjs-base ]; + description = "DOM library that supports both GHCJS and WebKitGTK"; + license = pkgs.stdenv.lib.licenses.mit; + hydraPlatforms = pkgs.stdenv.lib.platforms.none; + }) {}; } diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 973ff83c42d..673855227b8 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -54,7 +54,10 @@ let inherit mkDerivation callPackage; - ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { packages = pkgs self; }; + ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { + inherit (self) llvmPackages; + packages = pkgs self; + }; ghc = ghc // { withPackages = self.ghcWithPackages; }; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index faf1ce4046e..baefedf5a74 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -3,7 +3,7 @@ }: { pname -, version +, version, revision ? null , sha256 ? null , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; } , buildDepends ? [] @@ -15,8 +15,8 @@ , doHoogle ? true , editedCabalFile ? null , enableLibraryProfiling ? false -, enableSharedExecutables ? stdenv.lib.versionOlder "7.7" ghc.version -, enableSharedLibraries ? stdenv.lib.versionOlder "7.7" ghc.version +, enableSharedExecutables ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) +, enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version) , enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 , enableStaticLibraries ? true , extraLibraries ? [] @@ -43,18 +43,23 @@ , preFixup ? "", postFixup ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -}: +} @ args: assert pkgconfigDepends != [] -> pkgconfig != null; +assert editedCabalFile != null -> revision != null; let inherit (stdenv.lib) optional optionals optionalString versionOlder concatStringsSep enableFeature optionalAttrs; + isGhcjs = ghc.isGhcjs or false; + + newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal"; newCabalFile = fetchurl { - url = "http://hackage.haskell.org/package/${pname}-${version}/${pname}.cabal"; + url = newCabalFileUrl; sha256 = editedCabalFile; + name = "${pname}-${version}-r${revision}.cabal"; }; defaultSetupHs = builtins.toFile "Setup.hs" '' @@ -62,12 +67,12 @@ let main = defaultMain ''; - ghc76xOrLater = stdenv.lib.versionOlder "7.6" ghc.version; + ghc76xOrLater = isGhcjs || stdenv.lib.versionOlder "7.6" ghc.version; packageDbFlag = if ghc76xOrLater then "package-db" else "package-conf"; hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling); - enableParallelBuilding = versionOlder "7.8" ghc.version && !hasActiveLibrary; + enableParallelBuilding = versionOlder "7.10" ghc.version || (versionOlder "7.8" ghc.version && !hasActiveLibrary); defaultConfigureFlags = [ "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid" @@ -80,14 +85,17 @@ let (enableFeature enableSplitObjs "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableSharedLibraries "shared") - (optionalString (versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) - (optionalString (versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) - (optionalString (versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) + (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) + (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + ] ++ optionals isGhcjs [ + "--with-hsc2hs=${ghc.nativeGhc}/bin/hsc2hs" + "--ghcjs" ]; setupCompileFlags = [ (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir") - (optionalString (versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") + (optionalString (isGhcjs || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") (optionalString (versionOlder "7.10" ghc.version) "-threaded") # https://github.com/haskell/cabal/issues/2398 ]; @@ -106,9 +114,14 @@ let ghcEnv = ghc.withPackages (p: haskellBuildInputs); + setupBuilder = if isGhcjs then "${ghc.nativeGhc}/bin/ghc" else "ghc"; + ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + in stdenv.mkDerivation ({ - name = "${optionalString hasActiveLibrary "haskell-"}${pname}-${version}"; + name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; + + pos = builtins.unsafeGetAttrPos "pname" args; prePhases = ["setupCompilerEnvironmentPhase"]; preConfigurePhases = ["compileBuildDriverPhase"]; @@ -122,17 +135,17 @@ stdenv.mkDerivation ({ LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. prePatch = optionalString (editedCabalFile != null) '' - echo "Replacing Cabal file with edited version ${newCabalFile}." + echo "Replace Cabal file with edited version from ${newCabalFileUrl}." cp ${newCabalFile} ${pname}.cabal '' + optionalString jailbreak '' - echo "Running jailbreak-cabal to lift version restrictions on build inputs." + echo "Run jailbreak-cabal to lift version restrictions on build inputs." ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal '' + prePatch; setupCompilerEnvironmentPhase = '' runHook preSetupCompilerEnvironment - echo "Building with ${ghc}." + echo "Build with ${ghc}." export PATH="${ghc}/bin:$PATH" ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} @@ -158,7 +171,7 @@ stdenv.mkDerivation ({ configureFlags+=" --extra-lib-dirs=$p/lib" fi done - ghc-pkg --${packageDbFlag}="$packageConfDir" recache + ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache runHook postSetupCompilerEnvironment ''; @@ -171,7 +184,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ghc $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i runHook postCompileBuildDriver ''; @@ -244,22 +257,16 @@ stdenv.mkDerivation ({ isHaskellLibrary = hasActiveLibrary; env = stdenv.mkDerivation { - name = "interactive-${optionalString hasActiveLibrary "haskell-"}${pname}-${version}-environment"; + name = "interactive-${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}-environment"; nativeBuildInputs = [ ghcEnv systemBuildInputs ]; LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; shellHook = '' - export NIX_GHC="${ghcEnv}/bin/ghc" - export NIX_GHCPKG="${ghcEnv}/bin/ghc" + export NIX_GHC="${ghcEnv}/bin/${ghcCommand}" + export NIX_GHCPKG="${ghcEnv}/bin/${ghcCommand}-pkg" export NIX_GHC_DOCDIR="${ghcEnv}/share/doc/ghc/html" export NIX_GHC_LIBDIR="${ghcEnv}/lib/${ghcEnv.name}" ''; - buildCommand = '' - echo >&2 "" - echo >&2 "*** Haskell 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; }; }; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d39ea7b700f..d9c10f29b56 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -394,6 +394,7 @@ self: { mkDerivation { pname = "AES"; version = "0.2.9"; + revision = "1"; sha256 = "12n484dpjr08910ni1vvw030g9p37lz68l5lw0212rvklkva6wzc"; editedCabalFile = "9e51c1b1687fe35ccd0f2983e861b5b0441399803ff76b192530984724a68d6f"; buildDepends = [ @@ -416,12 +417,12 @@ self: { }) {}; "ALUT" = callPackage - ({ mkDerivation, base, freealut, OpenAL, OpenGL }: + ({ mkDerivation, base, freealut, OpenAL, StateVar, transformers }: mkDerivation { pname = "ALUT"; - version = "2.3.0.2"; - sha256 = "02kfyb4g7sfjfzqlddxqbjffrj4a0gfrzkisdpbj2lw67j1gq5dp"; - buildDepends = [ base OpenAL OpenGL ]; + version = "2.4.0.0"; + sha256 = "0g8rzzk54y8d567dvj32bq0h409ag0am196kkirsjd6f58vgjp0g"; + buildDepends = [ base OpenAL StateVar transformers ]; extraLibraries = [ freealut ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; @@ -903,7 +904,6 @@ self: { homepage = "http://github.com/konn/AttoJSON"; description = "Simple lightweight JSON parser, generator & manipulator based on ByteString"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Attrac" = callPackage @@ -972,7 +972,6 @@ self: { buildDepends = [ base containers llvm random timeit ]; description = "Embedded BASIC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1021,6 +1020,7 @@ self: { mkDerivation { pname = "Baggins"; version = "1.0"; + revision = "1"; sha256 = "0mgxq8zqyfmwkvn91y91c2vjhrni3br0vgiih2ynlafnas1ji0bc"; editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098"; buildDepends = [ base cairo containers mtl ]; @@ -1042,7 +1042,6 @@ self: { homepage = "https://github.com/5outh/Bang/"; description = "A Drum Machine DSL for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Barracuda" = callPackage @@ -1417,6 +1416,7 @@ self: { mkDerivation { pname = "BlastHTTP"; version = "1.0.1"; + revision = "2"; sha256 = "1qxf2lqsbwmfqkzabx8qpavf3da4lq3j1v1rdsv42gl27lqhbayi"; editedCabalFile = "e182e8cb8b1fdcff3f5cd8ba3e46f371f98ac55a3d2738061a6ab78aba52b308"; buildDepends = [ @@ -1457,6 +1457,7 @@ self: { mkDerivation { pname = "BlogLiterately"; version = "0.7.1.7"; + revision = "3"; sha256 = "05i0v5mrmnxbmrqrm473z6hs9j4c2jv1l81i4kdmm2wia6p93s90"; editedCabalFile = "04eff5dba1e60fa191970db5aa7c08f4c95dbc5f425cdea79037c5ee5823074c"; isLibrary = true; @@ -1480,6 +1481,7 @@ self: { mkDerivation { pname = "BlogLiterately-diagrams"; version = "0.1.4.3"; + revision = "1"; sha256 = "0p65nyslcvf4qzgrwsi59xil8i5sgh1xfyz431lf4f00nsqb0s2h"; editedCabalFile = "a9b96a72609bba1d29f628c22171dfb4e49e4c2ed7a8b3f5c2caf1127dff403d"; isLibrary = true; @@ -2038,23 +2040,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Cabal_1_22_1_1" = callPackage + "Cabal_1_22_2_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, extensible-exceptions, filepath, HUnit - , pretty, process, QuickCheck, regex-posix, test-framework - , test-framework-hunit, test-framework-quickcheck2, time, unix + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix }: mkDerivation { pname = "Cabal"; - version = "1.22.1.1"; - sha256 = "1m9yyan2f6l2r00f0sibikcj2kdrk313r5lhr20dyiyw2dlm33iy"; + version = "1.22.2.0"; + sha256 = "0q46wx1nvpi0cjbs9fw0kwmbyclkkvv5zp7dcssbdl3sqg216k6z"; buildDepends = [ array base binary bytestring containers deepseq directory filepath pretty process time unix ]; testDepends = [ base bytestring containers directory extensible-exceptions filepath - HUnit process QuickCheck regex-posix test-framework + HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP"; @@ -2063,6 +2066,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Cabal-ide-backend" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , deepseq, directory, extensible-exceptions, filepath, HUnit + , old-time, pretty, process, QuickCheck, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , time, unix + }: + mkDerivation { + pname = "Cabal-ide-backend"; + version = "1.23.0.0"; + sha256 = "07s9gkq2d4sz8nrjayrnb3gbjm58sp7gfl3hnl8n1gsxsfbl2cgw"; + buildDepends = [ + array base binary bytestring containers deepseq directory filepath + pretty process time unix + ]; + testDepends = [ + base bytestring Cabal containers directory extensible-exceptions + filepath HUnit old-time process QuickCheck regex-posix + test-framework test-framework-hunit test-framework-quickcheck2 unix + ]; + homepage = "http://www.haskell.org/cabal/"; + description = "A framework for packaging Haskell software"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "CabalSearch" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC , HDBC-sqlite3, process, unix @@ -2508,14 +2537,17 @@ self: { "ConcurrentUtils" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , network, parallel, process + , crypto-random, cryptohash, network, parallel, process + , reexport-crypto-random, RSA, securemem, tagged }: mkDerivation { pname = "ConcurrentUtils"; - version = "0.4.1.0"; - sha256 = "05a5v9g95by4v05zxvjma8hvn5rrvwz0c3r8q0iqqchglljs39xr"; + version = "0.4.2.0"; + sha256 = "1bxw8jrniczwc0pprva7zp6kzzrp5cj05r19j024fbgfw6vq9xz4"; buildDepends = [ - array base binary bytestring containers network parallel process + array base binary bytestring containers crypto-random cryptohash + network parallel process reexport-crypto-random RSA securemem + tagged ]; homepage = "http://alkalisoftware.net"; description = "Concurrent utilities"; @@ -3298,9 +3330,8 @@ self: { ({ mkDerivation, array, base, pretty }: mkDerivation { pname = "Diff"; - version = "0.3.0"; - sha256 = "0k7fj4icnh25x21cmrnbqq0sjgxrr2ffhn8bz89qmy5h9dznvy98"; - editedCabalFile = "f016d6dd8604572ffa07922b2790658b0b869290c5eaf210018bca921e943d47"; + version = "0.3.1"; + sha256 = "10saybbmd3qa4k11g0nqjfja7c87vi540y53j59778y0hhvykfif"; buildDepends = [ array base pretty ]; description = "O(ND) diff algorithm in haskell"; license = stdenv.lib.licenses.bsd3; @@ -3587,8 +3618,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, parsec }: mkDerivation { pname = "Dung"; - version = "1.0.0.1"; - sha256 = "12dlx4m3vqyc458bwjlh2i85b8k65wx5panibqc79p2ax5fvf2wz"; + version = "1.1"; + sha256 = "1higdpqg599lfc92m7dd4zy98l9vjg5xr4n4qjv0wifszj8lrsgb"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs containers parsec ]; @@ -3834,6 +3865,7 @@ self: { mkDerivation { pname = "EitherT"; version = "0.2.0"; + revision = "1"; sha256 = "1vry479zdq1fw7bd4d373c7wf2gg0aibkyb03710w7z2x86chssw"; editedCabalFile = "a1c6f78c9a4379af0738a6d4dee5d1781099c5c56acb0b39c45ad23b256e8c6e"; buildDepends = [ @@ -4116,6 +4148,7 @@ self: { mkDerivation { pname = "Euterpea"; version = "1.0.0"; + revision = "1"; sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds"; editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd"; buildDepends = [ @@ -4883,13 +4916,15 @@ self: { "GLUT" = callPackage ({ mkDerivation, array, base, containers, freeglut, libICE, libSM - , libXi, libXmu, mesa, OpenGL, OpenGLRaw + , libXi, libXmu, mesa, OpenGL, OpenGLRaw, StateVar, transformers }: mkDerivation { pname = "GLUT"; - version = "2.6.0.1"; - sha256 = "1bapwhhvc1mijq2macnwx79qbqsa6xg3882q58zfx7s3mqm3qycs"; - buildDepends = [ array base containers OpenGL OpenGLRaw ]; + version = "2.7.0.0"; + sha256 = "02y565fdfsl7pwl1wmyk5dma9ipc3l0yz7kwcgkvbzvqajhdg13d"; + buildDepends = [ + array base containers OpenGL OpenGLRaw StateVar transformers + ]; extraLibraries = [ freeglut libICE libSM libXi libXmu mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; @@ -4905,8 +4940,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.8.5"; - sha256 = "1jawv5fhfsxyil6hzg57bnrdcrichg03z239rs23rq31j668pqzv"; + version = "0.8.6"; + sha256 = "15z6l1r4dn8jp5b7awzw16zxd3lh297iwab712ah0dx8m3hk0df3"; buildDepends = [ array base bytestring containers directory filepath JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -5224,6 +5259,7 @@ self: { mkDerivation { pname = "Glob"; version = "0.7.5"; + revision = "1"; sha256 = "0hdyi49zp2yr4h4wgngl8ajrss1p309c3pn0alj543yrh33bnqq0"; editedCabalFile = "219b9caf1aaf9c2ab69ac75242f6017f0cd804a3370e0d63ac48777888fd909b"; buildDepends = [ @@ -5258,7 +5294,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Glome"; description = "Simple 3D vector library"; license = "GPL"; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "GlomeView" = callPackage ({ mkDerivation, base, deepseq, GlomeTrace, GlomeVec, monad-par @@ -5305,7 +5341,6 @@ self: { homepage = "https://github.com/favilo/GoogleDirections.git"; description = "Haskell Interface to Google Directions API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleSB" = callPackage @@ -5345,7 +5380,6 @@ self: { buildDepends = [ AttoJson base bytestring dataenc download-curl ]; description = "Interface to Google Translate API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GotoT-transformers" = callPackage @@ -5495,6 +5529,7 @@ self: { mkDerivation { pname = "Grow"; version = "1.1.0.3"; + revision = "3"; sha256 = "1vc4ln5fzvcv68qlanyw8mc6qchnjn1kj9rpz661n8ia1x8gkb3l"; editedCabalFile = "e599aab8eefc612bbf1dbae0b60308305a9d3009dda186b228e4e8aeeda1f36a"; buildDepends = [ @@ -5768,8 +5803,8 @@ self: { }: mkDerivation { pname = "HDBC"; - version = "2.4.0.0"; - sha256 = "1zwkrr0pbgxi2y75n2sjr3xs8xa3pxbmnqg3phqkjqcz3j4gcq6y"; + version = "2.4.0.1"; + sha256 = "1bfjffn44n8w0bvznjiqm4ckfs28nipachip98f125p784ff4gks"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -5817,8 +5852,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.2"; - sha256 = "0x42lf429dxjkz22jn5fybimlixxs20zq01ap40344qlwh01hd90"; + version = "2.3.2.3"; + sha256 = "1jv43rv3a0x7b7q5vzp07xffaf690gijx3rqnfv19fk63a7075j3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -6662,6 +6697,7 @@ self: { mkDerivation { pname = "HROOT"; version = "0.8"; + revision = "1"; sha256 = "0q6n5j1hzl8fk6a0ziqjzfi1515shqzqxx0argbvnhw85vjajvqf"; editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917"; buildDepends = [ @@ -6890,6 +6926,7 @@ self: { mkDerivation { pname = "HStringTemplate"; version = "0.7.3"; + revision = "2"; sha256 = "1gw4v16nk0878qplcx6by2bl4280lwyn9a252p6ldaqlbk9vygw8"; editedCabalFile = "f3b42ea4e5c29507d6d186ccd34c83425d2e16a55ca3af95fd8bb1a71e3f54cb"; buildDepends = [ @@ -6901,20 +6938,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "HStringTemplate_0_8_1" = callPackage + "HStringTemplate_0_8_3" = callPackage ({ mkDerivation, array, base, blaze-builder, bytestring, containers - , deepseq, directory, filepath, mtl, parsec, pretty, syb - , template-haskell, text, time, void + , deepseq, directory, filepath, mtl, old-locale, parsec, pretty + , syb, template-haskell, text, time, void }: mkDerivation { pname = "HStringTemplate"; - version = "0.8.1"; - sha256 = "1ccdr1ihlm6m5nb04wkqhksj77hhghag47zkxbmdc1d1qf5z5vzy"; + version = "0.8.3"; + sha256 = "064x4d9vhzln1c8ka3saqdz6a8skn3xbhaxrf3rjwqgmjg4v3mk3"; buildDepends = [ array base blaze-builder bytestring containers deepseq directory - filepath mtl parsec pretty syb template-haskell text time void + filepath mtl old-locale parsec pretty syb template-haskell text + time void ]; - jailbreak = true; description = "StringTemplate implementation in Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -6958,8 +6995,8 @@ self: { }: mkDerivation { pname = "HTF"; - version = "0.12.2.3"; - sha256 = "0g5z2ypn6i7wpz1439c6qjmi8lw2b86zaljkgwchjn8r8gvw4mbm"; + version = "0.12.2.4"; + sha256 = "0f538wqihj8i1ys3aciz7n1asxvg73bm9zg0p8qazzx9ghpcgy6m"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -7234,8 +7271,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.16.0.0"; - sha256 = "16b3aaaahsy153dfii2lc1672kkm6i9mch5hmyf9229b17hhh5pa"; + version = "3.16.1.1"; + sha256 = "0xi89wclnkrl17jl3ymvsvg802aj201m4lp0rg9adgmrrdgz042p"; buildDepends = [ base bytestring containers matrix parsec QuickCheck text transformers wl-pprint-extras @@ -8224,6 +8261,7 @@ self: { mkDerivation { pname = "Hsmtlib"; version = "2.8.8.8"; + revision = "1"; sha256 = "1zb5s5rwcqc90c3zv332k44p7l13ngp9nqci8qalnlbxbypx3hab"; editedCabalFile = "01f30561cce8648a656f075ba1e1f8c23144e7f10c6377a7949881dc513f8a89"; buildDepends = [ @@ -8358,8 +8396,8 @@ self: { }: mkDerivation { pname = "IPv6Addr"; - version = "0.6.0.0"; - sha256 = "1vrvjj3kvlrf8mgfxdz8rs3f0b5my82zncddyqzs8b2sccgiya12"; + version = "0.6.0.1"; + sha256 = "199pgv4y3932i585ak4sa78zvy1w49699lcs18836brvy10b2ch0"; buildDepends = [ attoparsec base iproute network network-info random text ]; @@ -8702,8 +8740,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.3"; - sha256 = "0nfq6c1kgmw1jj20686bp4rf52vpb8qc3whmz3jh0pwk489b2lwm"; + version = "3.2.3.1"; + sha256 = "1lq0v5z0kr2vbhj7xv07vygb6xqvp49sz8m9c20v394d2p5i2ai1"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -9323,9 +9361,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.1.1"; - sha256 = "00xap58zfcwndjnmciff8d65pgb7j08pa9gmpk4cqi50vmphaf5i"; - editedCabalFile = "390eff2095f519c59ac828108509047f29313ca894bc3355e6d79e943a035b50"; + version = "4.2.0"; + sha256 = "1ih0kjr3n576l6abasa8pnjajml27rj8h7nx3kqv2fdm7l6lk6zg"; buildDepends = [ array base bytestring containers dlist fmlist text vector ]; @@ -9995,12 +10032,16 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, random, transformers }: + ({ mkDerivation, base, mtl, random, transformers + , transformers-compat + }: mkDerivation { pname = "MonadRandom"; - version = "0.3.0.1"; - sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0"; - buildDepends = [ base mtl random transformers ]; + version = "0.3.0.2"; + sha256 = "18gajibgypy8hl0slh3lyjjwqqkayxrk7vwwk26nfdkq9yixxbvi"; + buildDepends = [ + base mtl random transformers transformers-compat + ]; description = "Random-number generation monad"; license = "unknown"; }) {}; @@ -10510,8 +10551,8 @@ self: { }: mkDerivation { pname = "Nomyx"; - version = "0.7.5"; - sha256 = "1vnq19yh1sr39zch76fxangslx12zsv5w7p6nq48cbz8jix0ypxp"; + version = "0.7.6"; + sha256 = "1zbrirplcgff9z75lmamh0i5749m22kvnwcr3s51wajnvh982qi3"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -10535,8 +10576,8 @@ self: { }: mkDerivation { pname = "Nomyx-Core"; - version = "0.7.5"; - sha256 = "0kd8rl0i7d4kbhnsakiqk0zmz956f12hccmql8fgnnww4fmf36zs"; + version = "0.7.6"; + sha256 = "16s60gap32kjs62zxjddppxyg9jhamzgm4d41mfg3vviadlacdrq"; buildDepends = [ acid-state aeson base blaze-html blaze-markup bytestring data-lens data-lens-fd data-lens-template DebugTraceHelpers deepseq directory @@ -10558,8 +10599,8 @@ self: { }: mkDerivation { pname = "Nomyx-Language"; - version = "0.7.5"; - sha256 = "11480ggfphwdyakhch1i8fr3cqhdmx32jg5nj5pc43sk3bpq2dwk"; + version = "0.7.6"; + sha256 = "0na9nm6qnayip2lx3nd3if4c1iyp7zs89jp2dgb7zkmbiwvax3l9"; buildDepends = [ base Boolean containers data-lens data-lens-fd data-lens-template DebugTraceHelpers ghc mtl old-locale random safe time @@ -10598,8 +10639,8 @@ self: { }: mkDerivation { pname = "Nomyx-Web"; - version = "0.7.5"; - sha256 = "161b87ysa9fh40r1z9cp1mzyrs5ws3d97bsrnqwgcaz4rhnjzyvb"; + version = "0.7.6"; + sha256 = "193v967bzhs0linqvh93w7viwdrlmsbdpnr8asigqhp5905zdjb7"; buildDepends = [ base blaze-html blaze-markup bytestring data-lens data-lens-fd fb filepath happstack-authenticate happstack-server hscolour mtl @@ -10824,7 +10865,6 @@ self: { homepage = "https://github.com/svenssonjoel/Obsidian"; description = "Embedded language for GPU Programming"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Octree" = callPackage @@ -10916,12 +10956,14 @@ self: { }) {}; "OpenAL" = callPackage - ({ mkDerivation, base, openal, OpenGL }: + ({ mkDerivation, base, ObjectName, openal, OpenGL, StateVar + , transformers + }: mkDerivation { pname = "OpenAL"; - version = "1.6.0.1"; - sha256 = "0m29p6mm87lbx1507n9w4ara4l1xva8j42xjp0771ngx4sbphn2y"; - buildDepends = [ base OpenGL ]; + version = "1.7.0.0"; + sha256 = "111r78zx39nyfnpq2pmy440bi4ymr6i2difwfaislvmjq43plhjw"; + buildDepends = [ base ObjectName OpenGL StateVar transformers ]; extraLibraries = [ openal ]; homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; @@ -10972,14 +11014,17 @@ self: { }) {}; "OpenGL" = callPackage - ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, OpenGLRaw - , text + ({ mkDerivation, base, bytestring, GLURaw, libX11, mesa, ObjectName + , OpenGLRaw, StateVar, text, transformers }: mkDerivation { pname = "OpenGL"; - version = "2.11.1.0"; - sha256 = "0fsk5jrap27rzv70q2257jwyrwr4g5qbv7kzi0fblydf7m1nq8hp"; - buildDepends = [ base bytestring GLURaw OpenGLRaw text ]; + version = "2.12.0.0"; + sha256 = "0f5s6b1mv3hm6xnansv0jsxahn8acc8nmr9754fx5b44bn1s6iqy"; + buildDepends = [ + base bytestring GLURaw ObjectName OpenGLRaw StateVar text + transformers + ]; extraLibraries = [ libX11 mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; @@ -11002,8 +11047,8 @@ self: { ({ mkDerivation, base, mesa, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "2.4.0.0"; - sha256 = "09l42mmx49046k29svgckcili0rxcb5pdfq0267bnijgqg0y08m2"; + version = "2.4.1.0"; + sha256 = "0xikg3jvmh1q514r2vnabw6d481h4qj93zpkp157wd155c7b0vjl"; buildDepends = [ base transformers ]; extraLibraries = [ mesa ]; homepage = "http://www.haskell.org/haskellwiki/Opengl"; @@ -11138,6 +11183,7 @@ self: { mkDerivation { pname = "PBKDF2"; version = "0.3.1.5"; + revision = "1"; sha256 = "0ljacj31pmcwk4lk24p37761sb60ncwjnjbqhnfrgdjqnyj2bd62"; editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e"; buildDepends = [ base binary bytestring Crypto random ]; @@ -11875,6 +11921,7 @@ self: { mkDerivation { pname = "QuickCheck"; version = "1.2.0.1"; + revision = "2"; sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld"; editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9"; buildDepends = [ base random ]; @@ -11922,8 +11969,8 @@ self: { ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { pname = "QuickCheck-GenT"; - version = "0.1.3"; - sha256 = "16zxmq0y8ayq9dgmgyfdm3fnjjhv452cymfam1zjmaabrayllkpp"; + version = "0.1.4"; + sha256 = "07zsp1praq0g6mcpfli9r1dwhfgj2cl5a2dljm6cdc8nsjl6dz7x"; buildDepends = [ base mtl QuickCheck random ]; jailbreak = true; homepage = "https://github.com/nikita-volkov/QuickCheck-GenT"; @@ -12333,17 +12380,18 @@ self: { "Redmine" = callPackage ({ mkDerivation, aeson, base, bytestring, connection, containers - , HTTP, http-client-tls, http-conduit, HUnit, MissingH, network - , old-locale, old-time, resourcet, text, time, transformers + , HTTP, http-client-tls, http-conduit, http-types, HUnit, MissingH + , network, old-locale, old-time, resourcet, text, time + , transformers }: mkDerivation { pname = "Redmine"; - version = "0.0.3"; - sha256 = "09bgg4q8140vxb4qv6i9mwj79dbwp8m4zcri6kxwkabb8z4l84hl"; + version = "0.0.5"; + sha256 = "0hmxxnb48arh0rbd0z1vl95l3n8yr24kjqnnf3n2by5szdhz06fb"; buildDepends = [ aeson base bytestring connection containers HTTP http-client-tls - http-conduit MissingH network old-locale old-time resourcet text - time transformers + http-conduit http-types MissingH network old-locale old-time + resourcet text time transformers ]; testDepends = [ aeson base bytestring connection containers http-client-tls @@ -12710,14 +12758,20 @@ self: { }) {}; "SHA" = callPackage - ({ mkDerivation, array, base, binary, bytestring }: + ({ mkDerivation, array, base, binary, bytestring, directory + , QuickCheck, test-framework, test-framework-quickcheck2 + }: mkDerivation { pname = "SHA"; - version = "1.6.4.1"; - sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl"; + version = "1.6.4.2"; + sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64"; isLibrary = true; isExecutable = true; - buildDepends = [ array base binary bytestring ]; + buildDepends = [ array base binary bytestring directory ]; + testDepends = [ + array base binary bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; description = "Implementations of the SHA suite of message digest functions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -12908,6 +12962,7 @@ self: { mkDerivation { pname = "SafeSemaphore"; version = "0.10.1"; + revision = "1"; sha256 = "0rpg9j6fy70i0b9dkrip9d6wim0nac0snp7qzbhykjkqlcvvgr91"; editedCabalFile = "1b168ec8de4b3958df15b33ba9ab60d8a651d9dd4ea36891d4c31ae81e7ec1cc"; buildDepends = [ base containers stm ]; @@ -13040,8 +13095,8 @@ self: { }: mkDerivation { pname = "ShellCheck"; - version = "0.3.5"; - sha256 = "0x4rvhpzrjkn9a9fsmp9iwv9g21hkrd8fgq05iy4wgv8nfhgv2cj"; + version = "0.3.6"; + sha256 = "0313i6h9m57g1ly5jviczvgbcvv8wdy0fi6hrws879zb745rb7zi"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -13399,6 +13454,7 @@ self: { mkDerivation { pname = "SpacePrivateers"; version = "0.1.0.0"; + revision = "1"; sha256 = "0gj709knv4lvz34900jigb1hiq35acbbl86iwa5yszibm8f0drkh"; editedCabalFile = "b59d607892ad860616cef196c83ff54388204102eae597acf88467a2f54764bf"; isLibrary = false; @@ -13988,6 +14044,7 @@ self: { mkDerivation { pname = "Thrift"; version = "0.6.0.1"; + revision = "1"; sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv"; editedCabalFile = "56a8ab041685777391702f1475e5c2a3462b36765bd53de2e21e1f55aa5999d9"; buildDepends = [ base binary bytestring ghc-prim HTTP network ]; @@ -14067,6 +14124,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Titim" = callPackage + ({ mkDerivation, base, containers, matrix, random }: + mkDerivation { + pname = "Titim"; + version = "0.2.3"; + sha256 = "1s8zvb38r9pxh55d5206lijprc6xsqnr0j670sdjrw7n8gyn7vav"; + isLibrary = false; + isExecutable = true; + buildDepends = [ base containers matrix random ]; + description = "Game for Lounge Marmelade"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Top" = callPackage ({ mkDerivation, base, containers, mtl, parsec }: mkDerivation { @@ -14575,6 +14646,7 @@ self: { mkDerivation { pname = "ViennaRNAParser"; version = "1.0.1"; + revision = "2"; sha256 = "0j4vcbbw0f1khrqna33b1dfs4fadfk53arsj8ndjzcwp0za58ji0"; editedCabalFile = "312de9a09fbd46cd8785a4761d369ddd022b2589096b857cafa0b4ee610426e0"; buildDepends = [ base parsec ]; @@ -14868,8 +14940,8 @@ self: { ({ mkDerivation, base, template-haskell, text, Win32 }: mkDerivation { pname = "Win32-errors"; - version = "0.2.2"; - sha256 = "158p8130x1dmis08zaqm8zdhdhj0xjdmli5gn2w3f7rsz748rhvw"; + version = "0.2.2.1"; + sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031"; buildDepends = [ base template-haskell text Win32 ]; homepage = "http://github.com/mikesteele81/win32-errors"; description = "Alternative error handling for Win32 foreign calls"; @@ -14895,8 +14967,8 @@ self: { ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { pname = "Win32-junction-point"; - version = "0.2.1"; - sha256 = "0d2hpzrbcvqfaw6vp03n56k5zjs6kk582hr3pd25j93g3rcyc8mf"; + version = "0.2.1.1"; + sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941"; buildDepends = [ base text Win32 Win32-errors ]; homepage = "http://github.com/mikesteele81/Win32-junction-point"; description = "Support for manipulating NTFS junction points"; @@ -14918,13 +14990,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Win32-security" = callPackage + ({ mkDerivation, base, text, Win32, Win32-errors }: + mkDerivation { + pname = "Win32-security"; + version = "0.1"; + sha256 = "19v0fcxqvkqzrpgbwzkgh06asfg86bkmkbb66w64wnh8s93iqywr"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base text Win32 Win32-errors ]; + homepage = "https://github.com/anton-dessiatov/Win32-security"; + description = "Haskell bindings to a security-related functions of the Windows API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Win32-services" = callPackage - ({ mkDerivation, Advapi32, base, errors, Win32 }: + ({ mkDerivation, Advapi32, base, Win32 }: mkDerivation { pname = "Win32-services"; - version = "0.2.4"; - sha256 = "006aiikccdgbv6m84z3wkkd3g5yn6zy85lb25b6c7r3rwxqm34d1"; - buildDepends = [ base errors Win32 ]; + version = "0.2.5"; + sha256 = "1ipsizxhs4900pn84r9hwm718mhrqs89g51vma6ba2j81fmziky2"; + buildDepends = [ base Win32 ]; extraLibraries = [ Advapi32 ]; homepage = "http://github.com/mikesteele81/win32-services"; description = "Windows service applications"; @@ -14995,7 +15082,6 @@ self: { homepage = "https://github.com/gbgar/Wordlint"; description = "Plaintext prose redundancy linter"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Workflow" = callPackage @@ -15053,6 +15139,7 @@ self: { mkDerivation { pname = "X11-extras"; version = "0.4"; + revision = "1"; sha256 = "1cpjr09gddcjd0wqwvaankv1zj7fyc6hbfdvar63f51g3vvw627a"; editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c"; buildDepends = [ base X11 ]; @@ -15198,6 +15285,7 @@ self: { mkDerivation { pname = "XSaiga"; version = "1.0.0.0"; + revision = "3"; sha256 = "0smf0ym26kv0fa34plnsndxp5hflc7w6g0wbkg6n4cy9bz4sgd4z"; editedCabalFile = "a152097b5010d51d0192d2c1748dce912a050f3f705f5a4b86ffa7a2f726488f"; isLibrary = true; @@ -15220,7 +15308,6 @@ self: { pkgconfigDepends = [ libXau ]; description = "A binding to the X11 authentication library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.xlibs) libXau;}; "Xec" = callPackage @@ -15348,8 +15435,8 @@ self: { ({ mkDerivation, base, random }: mkDerivation { pname = "Yampa"; - version = "0.9.6"; - sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0"; + version = "0.9.6.1"; + sha256 = "14nssljqgpirdjl6rxb1x4xxl6rpq2rhldhcvsvc0qx31mb01df1"; buildDepends = [ base random ]; homepage = "http://www.haskell.org/haskellwiki/Yampa"; description = "Library for programming hybrid systems"; @@ -15480,8 +15567,8 @@ self: { }: mkDerivation { pname = "Zora"; - version = "1.1.21"; - sha256 = "145mn0d9610hnc6p489s7b6ar63shbcm2rs83ij3ravdnp52ykjn"; + version = "1.1.22"; + sha256 = "0m49xfyxk92ddmh222h6drys05vncq7y374gnpgwpi4hrmzd0jbb"; buildDepends = [ base bytestring containers directory fgl graphviz random shelly text @@ -15593,7 +15680,9 @@ self: { mkDerivation { pname = "abeson"; version = "0.1.0.1"; + revision = "1"; sha256 = "1g258gfk7sk8hsd4nixah0vj69rwphvv6aywsvdldm8pbw51sy1c"; + editedCabalFile = "fc1839c19327f8fb9b36d2aa6dd133e3d391696183b3292894f9f7e1ca188727"; buildDepends = [ aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector @@ -15708,6 +15797,7 @@ self: { mkDerivation { pname = "accelerate"; version = "0.15.0.0"; + revision = "2"; sha256 = "1hi3zm1swm9fank9w98009pwcgccw6w2j2ilb970sbxyb0xf8nps"; editedCabalFile = "98cea47c7fdb595a54cb06751fe54eb800059e5a2b1f9699a65d4e845b55cd4c"; buildDepends = [ @@ -15755,7 +15845,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-cublas/"; description = "Basic Linear Algebra using native CUBLAS library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-cuda" = callPackage @@ -15768,6 +15857,7 @@ self: { mkDerivation { pname = "accelerate-cuda"; version = "0.15.0.0"; + revision = "2"; sha256 = "1z8nfciwxm2f2vaddnhan5gi9i1l7qa9h9fsngmdh8d6wabxxidy"; editedCabalFile = "5ed199c4c1d360ed3eaee24df7016462ed1fb1313ff47d6828be546eec8708fc"; buildDepends = [ @@ -15780,7 +15870,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-cufft" = callPackage @@ -15800,7 +15889,6 @@ self: { homepage = "http://code.haskell.org/~thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-examples" = callPackage @@ -15808,6 +15896,7 @@ self: { mkDerivation { pname = "accelerate-examples"; version = "0.15.0.0"; + revision = "1"; sha256 = "1jfwb0ryb8idfjc1gccb1h67hl730qn455k5z5wna8aikfscy7rq"; editedCabalFile = "2cf8a02096ae9902b9336ce9d0665b3233abb20381d0cb4585efc53357d795cc"; isLibrary = false; @@ -15817,7 +15906,6 @@ self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fft" = callPackage @@ -15825,13 +15913,13 @@ self: { mkDerivation { pname = "accelerate-fft"; version = "0.15.0.0"; + revision = "1"; sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v"; editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca"; buildDepends = [ accelerate accelerate-cuda base cuda cufft ]; homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fftw" = callPackage @@ -15887,10 +15975,10 @@ self: { accelerate accelerate-cuda accelerate-cufft accelerate-fftw accelerate-fourier base criterion ]; + jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/"; description = "Compare different implementations of the Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-io" = callPackage @@ -15900,6 +15988,7 @@ self: { mkDerivation { pname = "accelerate-io"; version = "0.15.0.0"; + revision = "1"; sha256 = "00p8jmxsgywhx30nd44pl6hdcr076y2s6z2fsam6sgrmgr0qx936"; editedCabalFile = "5c3f8f7ebc03117652646329743ea251d281f72d81454e55538c27e87e8c0ecc"; buildDepends = [ @@ -15973,8 +16062,8 @@ self: { }: mkDerivation { pname = "acid-state"; - version = "0.12.3"; - sha256 = "099n8a5qxrjzhw0jgmshcpkvynkj2v4a8a6lwy9fvg586nhcy9j1"; + version = "0.12.4"; + sha256 = "0mb2p29pi9dhby2bwn6zkg1nn3sf6vr7xzf6npx3738ffj3b2bad"; buildDepends = [ array base bytestring cereal containers directory extensible-exceptions filepath mtl network safecopy stm @@ -16150,7 +16239,6 @@ self: { homepage = "https://github.com/llelf/acme-lolcat"; description = "LOLSPEAK translator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-lookofdisapproval" = callPackage @@ -16651,6 +16739,7 @@ self: { mkDerivation { pname = "aeson"; version = "0.7.0.6"; + revision = "1"; sha256 = "0vsf9msz9iv7xvsnys5c0kbkldb0pvhiai02vz50b0d1kdsk2mb4"; editedCabalFile = "8b87a1343dd8d93d98e48e530f2ec14f5949fcdc96c8ecc81458a1d20defd001"; buildDepends = [ @@ -16830,7 +16919,6 @@ self: { homepage = "https://github.com/timjb/aeson-schema"; description = "Haskell JSON schema validator and parser generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-serialize" = callPackage @@ -17115,8 +17203,8 @@ self: { ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { pname = "aivika"; - version = "3.1"; - sha256 = "0q9w4lwf2k6r36vb452z2ykkdz4z4xcc7x4kgjrjfcxfca7m0l50"; + version = "4.0"; + sha256 = "1narrw9xy7xv7jvb94c0pvbgx22zcxjg78a78gc1b4kg9dh5gyjc"; buildDepends = [ array base containers mtl random vector ]; homepage = "http://github.com/dsorokin/aivika"; description = "A multi-paradigm simulation library"; @@ -17327,6 +17415,7 @@ self: { mkDerivation { pname = "algebra"; version = "4.2"; + revision = "1"; sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs"; editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210"; buildDepends = [ @@ -17807,19 +17896,18 @@ self: { ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, cryptohash, cryptohash-conduit, exceptions , http-conduit, lens, mmorph, monad-control, mtl, resourcet, retry - , text, time, transformers, transformers-base + , text, time, transformers, transformers-base, transformers-compat }: mkDerivation { pname = "amazonka"; - version = "0.3.2"; - sha256 = "1vyy8gsj31zxjnphzw1y3ylxdzxsgxx034a0s6i1g8vpqpf59n8a"; + version = "0.3.3.1"; + sha256 = "13lblmqpnd6anc6d6wv1xiqy0c2b8bnq9gh8df0xpbch756qfa4w"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph monad-control mtl resourcet retry text time transformers - transformers-base + transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -17829,99 +17917,92 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.2"; - sha256 = "11rx798qdqqk67djrfaknw3z7z5gf2m0ahi0nh4icgfljv8hzcda"; + version = "0.3.3"; + sha256 = "1jn5phz20xki1zprszp8y0l3wlbdxs23iq7d8rvgdnlp4wx1q4vj"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.2"; - sha256 = "0bbymf4cmlfp812nyk9y648hg8d2j57kf31g46w2a0rg4157rwqh"; + version = "0.3.3"; + sha256 = "1dbf6aabxss5fnbnwpldg5a87qda4vcrazmbnhhgil30pcgcjbld"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.2"; - sha256 = "1lcl16j4wk19gf3i4jhh85jx4gx3lhacfd4yzrp54ycsgy689y7p"; + version = "0.3.3"; + sha256 = "16i1p7j70rxw4b5hmdjzjrk302zqyfgbgvc49dq0ag5hc4351b71"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.2"; - sha256 = "0ss8raa4dvzz55x23kb7lrfgjkr0hrp7k6khbjpwp7ff2kk9yvwb"; + version = "0.3.3"; + sha256 = "0sp3z01jwm9jnalq8yy9vxvjwzwvqj0vzb7syms60ii3hclc30ka"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.2"; - sha256 = "06as3a91061wy6wxd5ci37aisgghfm1w4k40id8b65yh8i0xwjd9"; + version = "0.3.3"; + sha256 = "0z1zvk37kds3wlhvd6036g63lvc37axnam9fv646s183xhfrmns8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.2"; - sha256 = "1zyf8w88r5827i2l1x29kanqhmq8glgx01739g7hlya5hd30lv4y"; + version = "0.3.3"; + sha256 = "104qj5cc3ka8ixr1hh4asmfar31rd6k04w4g72c5xzy6l11vzp7j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.2"; - sha256 = "1a3zj57nik0ffayq99y0pn8aqsvhdsi3fc4ynfkn9x0yxhgxx0kz"; + version = "0.3.3"; + sha256 = "00caawzj1jjbhxrd53hzqnw66a20r31gvlv19xps3jr49bhrjs15"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.2"; - sha256 = "1l6rz3zvnsfym54bs2s1njrpf9rj1s7rdhli5d2yacj7kabb1hlz"; + version = "0.3.3"; + sha256 = "10044nfmdj1isf8wq0si5nn44c0ya16s1kir65c4g2cisarj0vr0"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -17932,91 +18013,86 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.2"; - sha256 = "1yr0xp1camsw7qapnp5w9jlrg8zy275n3izhl5i8z1wc5wln229d"; + version = "0.3.3"; + sha256 = "0fm8zwdsywhgxnpqi9s5jnasfknjiix15wmfx8in1d6kf52sgy5n"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.2"; - sha256 = "038n7290q9a1hsk0k832q3a782x053jfmh1j6ydk8c245q807544"; + version = "0.3.3"; + sha256 = "1chbakfpiz5ix3z7hi50c25dc71s6dxkxap1b6z28fqyigd8ycn6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.2"; - sha256 = "094j0m4kjijz6ihr7q4jklnb8gmyrqgk1bxw1z94xqb3s60fwy9c"; + version = "0.3.3"; + sha256 = "1kfnkh5x5s9smg5f82na4kkvc1ljadnc9041zk4nk4vsch41wg5j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.2"; - sha256 = "1z9p672zwiihaj83wv1wpvqj70m9795pay44qps4as1xcb1skwc4"; + version = "0.3.3"; + sha256 = "138i4b53x82j9agdlbbq90al6397zns2732igadfa3yydy0m9w0v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.2"; - sha256 = "0ha6adx6m27dmh6dxyha7kk344190hd151rp1lcihchhsnr283hk"; + version = "0.3.3"; + sha256 = "04gvg50przsxagrj7zvbidyf0xx3iqhh23sbzbpfl6ljczig9qmk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, bytestring, case-insensitive , conduit, conduit-extra, cryptohash, data-default-class, hashable - , http-client, http-types, lens, mmorph, mtl, nats, resourcet - , scientific, semigroups, tagged, tasty, tasty-hunit - , template-haskell, text, time, transformers, unordered-containers - , vector, xml-conduit + , http-client, http-types, lens, mmorph, mtl, nats, old-locale + , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, vector, xml-conduit }: mkDerivation { pname = "amazonka-core"; - version = "0.3.2"; - sha256 = "0byp43084jinc8pabplcmjr1spkx5gy666rwpl7xxmzcqlacdjzi"; + version = "0.3.3"; + sha256 = "1mglm6w0pmbhvvgzw5ylv0k97f9cx9nk8yq3akp499bn8nxf70i3"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra cryptohash data-default-class hashable http-client http-types lens - mmorph mtl nats resourcet scientific semigroups tagged text time - transformers unordered-containers vector xml-conduit + mmorph mtl nats old-locale resourcet scientific semigroups tagged + text time transformers transformers-compat unordered-containers + vector xml-conduit ]; testDepends = [ aeson base tasty tasty-hunit template-haskell text ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Core functionality and data types for Amazonka libraries"; license = "unknown"; @@ -18026,60 +18102,56 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.2"; - sha256 = "0hxgzdbv8fc0rl00afny3j1ka2fib98bamjphfdrjkb6ic37a2mx"; + version = "0.3.3"; + sha256 = "1r4k349yy7zi6jas9llxvig6jbqlq2b1nwgy1d40zr4hgjxx9zhk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.2"; - sha256 = "1nby1qs901k8xc3ykpvi1097b92bcd5c9l3d0sx7dci6i4hnbqlf"; + version = "0.3.3"; + sha256 = "068b60p7gka5azfk181z4n6sdlz5mmnn88x1kcpj3ld290sq264i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.2"; - sha256 = "08034a5nwcja147rkc0bsgmcj33xv1w6cvz7fpyi4jwip1ffngr9"; + version = "0.3.3"; + sha256 = "0hiksl517yc07dbkm72ms6rr07hwkr7g3390v8xqgv1bqg33cwls"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.2"; - sha256 = "1x5xqlk0gh9ac2721j444nzz98q749mvkwhdgb476hi6lmc7g9gn"; + version = "0.3.3"; + sha256 = "18gsf2hwa3vii1g80rxw8b6j4cj513sglf6i4jpf6l96ncs1zavy"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.2"; - sha256 = "02w1zxcs7sz5xgdpr3iq5yd1d3w15rkjnkcqyxhkbgwcv6w4c2zc"; + version = "0.3.3"; + sha256 = "0ssdhcdsjysxxzfa0r40jpf9s6x5gwds1lyr462zkai1nc63f8f3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18090,73 +18162,68 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.2"; - sha256 = "1a743l0hr7mb337xw3ql7mg4256w0w5c2vss12al9kzpnrgi2lh3"; + version = "0.3.3"; + sha256 = "19zdxmisp3bh2lfx0a7ivghpciwgdmbmj4iah2fgwxbc01p0srbm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.2"; - sha256 = "16g5v9y3y9wdxiw5cw3z8i4b67y1acvz74d1qdk7by1s2smb4dkf"; + version = "0.3.3"; + sha256 = "09awjlp1yay1arpw5yavz879v40hxsy5pij8ky4fnvwdclsxx0qs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.2"; - sha256 = "1mymjy2dq4dz1r7yllgxdpbyddg7x7pvaarl395dffrapgqkh0n2"; + version = "0.3.3"; + sha256 = "06nq2zz2yc1wsgx8m9cb0filb9wfmcj4xh0ipk4jzlnhnl2izir2"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.2"; - sha256 = "0jxa9c8y9i1rffxfb2wrpb1fv6niplj2mwwc591k74c99ynjwj6i"; + version = "0.3.3"; + sha256 = "1rdzcxj6ccpqprmq6jdqyv1frmcwd8n21slx70bvqmls208nydf7"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-emr" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.2"; - sha256 = "1n6q77riz31xqk5qywiqs75avwdni1d9x9955jgs8s1phk48654c"; + version = "0.3.3"; + sha256 = "1fpppmsg4bdabczcbhcar7kjxkv0c2j8nqjckfimj57bbxslxjdx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.2"; - sha256 = "1cphxr7a60z18zh543nva7v18zh05r4iircfbgifj98w33gvcvqd"; + version = "0.3.3"; + sha256 = "11dli63wj57yya7yzc8fh06yvcrqhpf9w2wzb08si30xkbzx3jw1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18167,47 +18234,44 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.2"; - sha256 = "1v869rmqbihn1314nd1ryqpgrwfxicnjh7i41zbn5hq60c4xkn4z"; + version = "0.3.3"; + sha256 = "0hpaj7d9lkfb589qr9nrvf3c7plqml9v1b7kgckx5x7abjva102h"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.2"; - sha256 = "03bzizq6mchxk79gqnp8v4avw4alyccd51ks3wl2ljgq0ywl41xs"; + version = "0.3.3"; + sha256 = "1fkgz9w3dkvmkyprvadbhwzc0928zib7k09dfvwdb6h1phhl9w6f"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.2"; - sha256 = "16gqc9d9s3fz2qs1l4b4wjylsyl2p7ncyfibadkp8an6bfdylx31"; + version = "0.3.3"; + sha256 = "08x1wyqf6kibvkrg4dcsz638x7fnl4z23nninvcmrcivfqcjy27a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.2"; - sha256 = "10xjddl0mwpkcgz9ydy0lvmwpg3d3hb7kliqsqvfwlqgslhvhs18"; + version = "0.3.3"; + sha256 = "13hllhcvn2annqhq0dxcv1rvlhzj161xjhnz8vwazcsmpv2wb6pk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18218,151 +18282,140 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.2"; - sha256 = "0i4cy5x7br58lmzndx4x8mj81xkwx50nf1r8cszbjwjpml6fc2pz"; + version = "0.3.3"; + sha256 = "0a11riyrs6xx0207p4nkmxvc0y11ndrl6k3rgz2jdvv7g1j31fym"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.2"; - sha256 = "0xgj4r8zj0f2wmmpr63p3dlgfvgr5lmd43ngn5ignkmha6m6lcys"; + version = "0.3.3"; + sha256 = "03hk0s9l93vksifgy5bdb52mn2v38732c047bgmqfzf48iic2i48"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rds" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.2"; - sha256 = "0p73yn82pd0i1wi98vfy9kndf1ax0c3wza30nj6dra5xl4jnl73p"; + version = "0.3.3"; + sha256 = "1h291g4wx2v50whjn4c9h64gvv1j2pn6pyzs7l7765nm3rdmb7cr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-redshift" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.2"; - sha256 = "0w75vc1khlncfx82mcbpp41c8svjm7yy7si0p5rqi6cvx0an1k2v"; + version = "0.3.3"; + sha256 = "1wivm4ad6p8f5wip7d9cdwk557vy5dnakg62i5bsvi2l05wxh5zr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.2"; - sha256 = "0gsfgkcdprqanjfgcw4lj77b4fvhlq47h636kh87yvjg70migyrx"; + version = "0.3.3"; + sha256 = "0095idbqw6gs6h6pm0amzf6yhqr801pnlad914yac3xk80iywh9i"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.2"; - sha256 = "0kzhn1mdk79a8vn0kj5jk5w0vfywh89bf5khjv08m3qwwdyb0mnw"; + version = "0.3.3"; + sha256 = "1np4x5lj9a8qgikiwbq2xchh2ngifmhd01lrbpzy44glda0gpxnc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.2"; - sha256 = "0ws7dy9bnv7qx43mx6s1lkj4z1r3v7b0pph6kl3s5q60s1f9qr64"; + version = "0.3.3"; + sha256 = "0qhdxklj2ilsgmk0cy5bdiyvdgmi9npwxfjbb8ngbg9mavdcs0rh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.2"; - sha256 = "1im0lzgxzxxpb6dmigp9vcwwk79bs9m9y3lhcjn7bcspql426c7a"; + version = "0.3.3"; + sha256 = "163aqpaxv2pfbfmz3mjw7dzcsjxjfiy36vqk2hsgavbmsgy7d4wq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ses" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.2"; - sha256 = "0l9v7kagssnzg1f4w63q4dza5gyxlm3v6hrjcspdlaxw695vn7j8"; + version = "0.3.3"; + sha256 = "18qjpn29hyc9lqky6d0kwi3i4kanzvii45csw2fvjlmcchb1mfhs"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sns" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.2"; - sha256 = "1crlyx87j5iw7dvjngnrqqhkx24f0zd48l2cz37ldqymrsfn7kqb"; + version = "0.3.3"; + sha256 = "14321x8chggq5fc12z7v5z8aic4p0r3fb8lrk595nwqybnamqg19"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.2"; - sha256 = "1mr2ra4857j4n4lpf5zlrqxmvf5adk6l0ycbwah4cypd3ki7b7l6"; + version = "0.3.3"; + sha256 = "030a0vx6py0m0gwplzjzkl3z7iq8n8s1f0knpw6da5xa8sy2na6v"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ssm" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.2"; - sha256 = "0hb35i65j2zl6v1y3drd2kacg5ahvl14isx1f8b7a1k48l90qccn"; + version = "0.3.3"; + sha256 = "0sk8kbb06v52gq0jxhrz0dzdv4kfhn2g0f5kvcpa3vrpvca0jnyk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -18373,52 +18426,48 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.2"; - sha256 = "08c74hniznflx7xvlk41r2aym1h3xal68lbr2r0qlmh846pfyiqa"; + version = "0.3.3"; + sha256 = "1fzr4c81xqblag8gd3sj6nc029b2klblxall2wm29ggv8j70n48b"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.2"; - sha256 = "0sq6ws9qyga1giiv2pkfgfaigni5k33mzq3k1psliwjxscxcjknw"; + version = "0.3.3"; + sha256 = "0lzpzvz1k00w1q5ahh76gvhhh7jyk3450ylhbrgjd8gw81k3klnj"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.2"; - sha256 = "1j3vwpjmmlv3c4n4jrgj2vvvcirky1ja7grv5ax790i5p0ll0iw8"; + version = "0.3.3"; + sha256 = "05v8m84gvwdqyalvck8lfn7x525kkah6f87bwd0mrci9vqdi55hc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.2"; - sha256 = "18yh9saqjfcn8cjprjqiybgkvxq6hc8q8b6njsh61s6ycdnh0yx8"; + version = "0.3.3"; + sha256 = "1lrxr7dlbkv7x7hcdvf0ly3d4aj0i4j94yksd2x3jp5w33811hjx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ampersand" = callPackage @@ -18502,7 +18551,6 @@ self: { buildDepends = [ base deepseq parsec ]; description = "Interpreter for AM"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "analyze-client" = callPackage @@ -18689,8 +18737,8 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.7.1"; - sha256 = "1by11bg1bd7z18hqgayk0w76hy5n63kmdl14gainlvfgr9jw506r"; + version = "0.6.7.2"; + sha256 = "0x0pv7hq4q2n103pzzxghmgzmd3b5cwpnmkdbpzry222890w8ph1"; isLibrary = true; isExecutable = true; buildDepends = [ ansi-terminal base ]; @@ -18995,8 +19043,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.2"; - sha256 = "0r57rzrnhznzkgh57p1ajsgi28g1q5732xl819wr4rlzq733khal"; + version = "1.4.3"; + sha256 = "1z6fgdkn3k4sbwk5jyz6yp9qwllhv2m9vq7z25fhmj41y3spgcsc"; buildDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -19024,7 +19072,9 @@ self: { mkDerivation { pname = "apiary-authenticate"; version = "1.4.0"; + revision = "1"; sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; + editedCabalFile = "724a8cbf0f2e57cd497b54de4401acda2877437053f13164dd23ba7b6c7d119b"; buildDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types @@ -19043,7 +19093,9 @@ self: { mkDerivation { pname = "apiary-clientsession"; version = "1.4.0"; + revision = "1"; sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; + editedCabalFile = "ac724d51a8bd867838bccb788a0db76f97cfe19b052d1247e38ba001561e4bfd"; buildDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -19060,12 +19112,13 @@ self: { mkDerivation { pname = "apiary-cookie"; version = "1.4.0"; + revision = "1"; sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; + editedCabalFile = "50b9adcb346e7233cb73eef7e7d00902a7b43454ab998f76923582bada569e32"; buildDepends = [ apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -19076,7 +19129,9 @@ self: { mkDerivation { pname = "apiary-eventsource"; version = "1.4.0"; + revision = "1"; sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; + editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6"; buildDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -19091,7 +19146,9 @@ self: { mkDerivation { pname = "apiary-helics"; version = "1.4.0"; + revision = "1"; sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a"; + editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827"; buildDepends = [ apiary base bytestring data-default-class helics helics-wai monad-control text transformers types-compat vault wai @@ -19110,7 +19167,9 @@ self: { mkDerivation { pname = "apiary-logger"; version = "1.4.0"; + revision = "1"; sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; + editedCabalFile = "cb2677faabb41ccf7a4990179990f55c14d5bcd517591ccd086b84c68362c93c"; buildDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base @@ -19129,7 +19188,9 @@ self: { mkDerivation { pname = "apiary-memcached"; version = "1.4.0"; + revision = "1"; sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby"; + editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29"; buildDepends = [ apiary base bytestring data-default-class memcached-binary monad-control text transformers types-compat @@ -19147,7 +19208,9 @@ self: { mkDerivation { pname = "apiary-mongoDB"; version = "1.4.0"; + revision = "1"; sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; + editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b"; buildDepends = [ apiary base bson data-default-class lifted-base monad-control mongoDB resource-pool text time transformers types-compat @@ -19165,7 +19228,9 @@ self: { mkDerivation { pname = "apiary-persistent"; version = "1.4.0"; + revision = "1"; sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; + editedCabalFile = "23a9ba31cd7fab41378b61a82e5ad92d04b6f3a32e32edca3217f5f824c13736"; buildDepends = [ apiary apiary-logger base monad-control monad-logger persistent resource-pool resourcet transformers transformers-base types-compat @@ -19184,7 +19249,9 @@ self: { mkDerivation { pname = "apiary-purescript"; version = "1.4.0"; + revision = "1"; sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz"; + editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c"; buildDepends = [ apiary base bytestring data-default-class filepath Glob parsec purescript text transformers types-compat unordered-containers @@ -19199,7 +19266,9 @@ self: { mkDerivation { pname = "apiary-session"; version = "1.4.0"; + revision = "1"; sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; + editedCabalFile = "8e4a0b590972ea4e1ab1252696b7339038c4d7206ae44d1f1397a67cdde077dd"; buildDepends = [ apiary base types-compat wai web-routing ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; @@ -19213,7 +19282,9 @@ self: { mkDerivation { pname = "apiary-websockets"; version = "1.4.0"; + revision = "1"; sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; + editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581"; buildDepends = [ apiary base wai-websockets web-routing websockets ]; @@ -19502,8 +19573,8 @@ self: { }: mkDerivation { pname = "arbtt"; - version = "0.9"; - sha256 = "1076fy65b0qzjind3zm170ws8dq76f34n4b0gjn98v4a0nsk60xw"; + version = "0.9.0.1"; + sha256 = "0x0aixipm32vx1jdqlpnwzk9lsv5d9fiqw5jzz92mfbs9s8jv81k"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -19693,6 +19764,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arion" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, fsnotify + , hspec, process, regex-posix, safe, split, system-filepath, text + , time, transformers + }: + mkDerivation { + pname = "arion"; + version = "0.1.0.8"; + sha256 = "107rbbzmqg0zrgv3qb0pr8svmzh25a63dm0kn0hhyirkjzdyjgqw"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filemanip fsnotify process regex-posix + safe split system-filepath text transformers + ]; + testDepends = [ + base containers directory filemanip fsnotify hspec process + regex-posix safe split system-filepath text time + ]; + homepage = "http://github.com/karun012/arion"; + description = "Watcher and runner for Hspec"; + license = stdenv.lib.licenses.mit; + }) {}; + "arith-encode" = callPackage ({ mkDerivation, arithmoi, array, base, binary, Cabal, containers , fgl, hashable, HUnit-Plus, unordered-containers @@ -19732,14 +19827,13 @@ self: { }: mkDerivation { pname = "arithmoi"; - version = "0.4.1.1"; - sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; - editedCabalFile = "8bf01e402d887e4d95dad0189e75420b125c15bc6234784929535a08c471298a"; + version = "0.4.1.2"; + sha256 = "0i0cndldf426cc8dv6swqfnljv9lgba9vp1ac4xk0vdbmbwqan9m"; buildDepends = [ array base containers ghc-prim integer-gmp mtl random ]; configureFlags = [ "-f-llvm" ]; - homepage = "https://bitbucket.org/dafis/arithmoi"; + homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; license = stdenv.lib.licenses.mit; }) {}; @@ -19917,6 +20011,7 @@ self: { mkDerivation { pname = "arxiv"; version = "0.0.1"; + revision = "1"; sha256 = "1has8v40h8w4v393pgd4qk4fzgdw02y12zk2hspkic1q5bx33dxh"; editedCabalFile = "746311e6003440248df63acd19e428cbdbf5c95cdd3ee0993d2c89c7b2ceada7"; buildDepends = [ base parsec split tagsoup ]; @@ -19960,8 +20055,8 @@ self: { }: mkDerivation { pname = "ascii-progress"; - version = "0.2.1.1"; - sha256 = "0r5m24hmfb5fbdf9j7dxp12m16dzfp93ivagqvd40ix7gll0nsck"; + version = "0.2.1.2"; + sha256 = "0lnxph4zdhkhp2w4rvx85xdwy8lnnm81apvkrddbwfr405j4nf1w"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19973,7 +20068,7 @@ self: { ]; homepage = "https://github.com/yamadapc/haskell-ascii-progress"; description = "A simple progress bar for the console"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.mit; }) {}; "ascii-vector-avc" = callPackage @@ -20068,6 +20163,7 @@ self: { mkDerivation { pname = "asn1-data"; version = "0.7.1"; + revision = "1"; sha256 = "10s7mxygw6w8a8mx090msvbl8pji8m68lsxxyr5bp7p887naia7r"; editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f"; isLibrary = true; @@ -20326,8 +20422,8 @@ self: { }: mkDerivation { pname = "async-pool"; - version = "0.8.0"; - sha256 = "13c3b8ggry476hp83bq0450j5y9990flq62jj6mjpjapyn1w283z"; + version = "0.9.0"; + sha256 = "10952y60ivkx78skf7ds0dv8gp6bf3v47lays928vnpb8m5cr0rh"; buildDepends = [ async base containers fgl monad-control stm transformers transformers-base @@ -20338,7 +20434,6 @@ self: { ]; description = "A modified version of async that supports worker groups and many-to-many task dependencies"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asynchronous-exceptions" = callPackage @@ -20504,6 +20599,7 @@ self: { mkDerivation { pname = "atomic-primops"; version = "0.7"; + revision = "1"; sha256 = "1gd2m7qnyww3dv5vcajh9j5chcwlkfsqgpi299q2x4n9xrp0d50g"; editedCabalFile = "99594a0f7b2fd268f7f68e460218c22bda9da07c559fb5ead6d3c508f01d9cff"; buildDepends = [ base ghc-prim primitive ]; @@ -20545,17 +20641,17 @@ self: { "atomic-write" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, hspec - , temporary, text, unix + , temporary, text, unix-compat }: mkDerivation { pname = "atomic-write"; - version = "0.2.0.0"; - sha256 = "0kga6zwgpsz3zc3yq12a815ywwyqd18czzmi8ra7vrgfn5l2bcb0"; + version = "0.2.0.3"; + sha256 = "0hs157shwaqhqbd063wmfb8amkf2kppg7k4j0lhfflq1gzjbsprm"; buildDepends = [ - base bytestring directory filepath temporary text unix + base bytestring directory filepath temporary text unix-compat ]; testDepends = [ - base bytestring directory filepath hspec temporary text unix + base bytestring directory filepath hspec temporary text unix-compat ]; description = "Atomically write to a file"; license = stdenv.lib.licenses.mit; @@ -20604,7 +20700,9 @@ self: { mkDerivation { pname = "atto-lisp"; version = "0.2.2"; + revision = "1"; sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc"; + editedCabalFile = "feb39753d89c58abac767ed3fe5644428b5d15d83c69f7b26b282f3b9969f2fa"; buildDepends = [ attoparsec base blaze-builder blaze-textual bytestring containers deepseq text @@ -20625,8 +20723,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.12.1.3"; - sha256 = "1m5sk60k9x4hs0qpglj5adr3n5zwpvarpylkjkx2xx63p74cj82f"; + version = "0.12.1.5"; + sha256 = "131l2qax0qnc157r9llp3lbwy7390g8r3ckzvdqbif6lfy0zg2rq"; buildDepends = [ array base bytestring containers deepseq scientific text ]; @@ -20798,6 +20896,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "audiovisual" = callPackage + ({ mkDerivation, base, boundingboxes, colors, deepseq, directory + , filepath, free, freetype2, hashable, JuicyPixels + , JuicyPixels-util, lens, linear, mtl, objective, random + , template-haskell, transformers, vector, void, WAVE + }: + mkDerivation { + pname = "audiovisual"; + version = "0.0"; + sha256 = "0qjcsvv52l53iqyh7hkhwdsifqb943wjp1vn63qhqsrdaajazp3h"; + buildDepends = [ + base boundingboxes colors deepseq directory filepath free freetype2 + hashable JuicyPixels JuicyPixels-util lens linear mtl objective + random template-haskell transformers vector void WAVE + ]; + homepage = "https://github.com/fumieval/audiovisual"; + description = "A battery-included audiovisual framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "augeas" = callPackage ({ mkDerivation, augeas, base, bytestring, directory, HUnit, unix }: @@ -20906,8 +21024,8 @@ self: { }: mkDerivation { pname = "authenticate-oauth"; - version = "1.5.1"; - sha256 = "1swqrqz3idc6zghwsx3yd1rpphgi74r5yp31rkvcik6dwzrgdn1f"; + version = "1.5.1.1"; + sha256 = "02y35yd4zmpy36yba2nzbvijhfw0wvijkiqmh7h9qjpbqvmib7zb"; buildDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -20952,15 +21070,15 @@ self: { "auto" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , profunctors, random, semigroups, transformers + , MonadRandom, profunctors, random, semigroups, transformers }: mkDerivation { pname = "auto"; - version = "0.2.0.4"; - sha256 = "1a2sz8snlxc7jgqs33vgczi1k4m4ssixq5xxgzclv0sz050cigh9"; + version = "0.2.0.6"; + sha256 = "1k0nzhkn32jypf1yqjqadmqwq9ckyax23lmvwzz110fx657j1nhi"; buildDepends = [ - base bytestring cereal containers deepseq profunctors random - semigroups transformers + base bytestring cereal containers deepseq MonadRandom profunctors + random semigroups transformers ]; jailbreak = true; homepage = "https://github.com/mstksg/auto"; @@ -21053,6 +21171,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avers" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, containers, cryptohash, inflections, influxdb + , MonadRandom, mtl, network, resource-pool, rethinkdb-client-driver + , scrypt, stm, template-haskell, text, time, unordered-containers + , vector + }: + mkDerivation { + pname = "avers"; + version = "0.0.3"; + sha256 = "0y58qixd9kjm0wp5spachm581mshp15pcvlyv48nsrabrzssn3ng"; + buildDepends = [ + aeson attoparsec base base16-bytestring bytestring containers + cryptohash inflections influxdb MonadRandom mtl network + resource-pool rethinkdb-client-driver scrypt stm template-haskell + text time unordered-containers vector + ]; + description = "empty"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avl-static" = callPackage ({ mkDerivation, base, QuickCheck, test-framework , test-framework-quickcheck2 @@ -21137,8 +21277,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.11.2"; - sha256 = "15qn5fwaqzf6mqs6bahcddqhnhgbjbprw321yf2g68qq2h6dzqzi"; + version = "0.11.3"; + sha256 = "02p3dn380qj8wg6alm7yqw4svwwkw9ln9rjd6shbk4jz8gsaka8l"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21253,17 +21393,17 @@ self: { "aws-general" = callPackage ({ mkDerivation, aeson, attoparsec, aws, base, base16-bytestring , blaze-builder, byteable, bytestring, case-insensitive, charset - , cryptohash, directory, either, errors, hashable, http-types - , old-locale, parsers, QuickCheck, quickcheck-instances, tagged - , tasty, tasty-quickcheck, text, time, transformers + , cryptohash, deepseq, directory, either, errors, hashable + , http-types, old-locale, parsers, QuickCheck, quickcheck-instances + , tagged, tasty, tasty-quickcheck, text, time, transformers }: mkDerivation { pname = "aws-general"; - version = "0.2.0"; - sha256 = "1cizkj7f8l57g95drhgnaylv0yzp7mblwh92z2syfqfkvg5m5fwa"; + version = "0.2.2"; + sha256 = "08sy37w162zqd6dqi8kkg0782nv00jsp48bnrmhwhmkhnd2arfrj"; buildDepends = [ aeson attoparsec base base16-bytestring blaze-builder byteable - bytestring case-insensitive cryptohash hashable http-types + bytestring case-insensitive cryptohash deepseq hashable http-types old-locale parsers QuickCheck quickcheck-instances text time transformers ]; @@ -21279,19 +21419,20 @@ self: { "aws-kinesis" = callPackage ({ mkDerivation, aeson, aws, aws-general, base, base64-bytestring - , blaze-builder, bytestring, conduit, conduit-extra, errors - , http-conduit, http-types, mtl, parsers, QuickCheck + , blaze-builder, bytestring, conduit, conduit-extra, deepseq + , errors, http-conduit, http-types, mtl, parsers, QuickCheck , quickcheck-instances, resourcet, tagged, tasty, tasty-quickcheck , text, time, transformers }: mkDerivation { pname = "aws-kinesis"; - version = "0.1.3"; - sha256 = "0ka5hqrin7hhr1vavl1ky35gnhil2r6ajbxdl11dbdnhm11sllvq"; + version = "0.1.5"; + sha256 = "0npiff5zrcs552y8lq3q6fgnwffqy11dvgs3yaygy0m99mgiaaiz"; buildDepends = [ aeson aws aws-general base base64-bytestring blaze-builder - bytestring conduit conduit-extra http-conduit http-types parsers - QuickCheck quickcheck-instances resourcet text time transformers + bytestring conduit conduit-extra deepseq http-conduit http-types + parsers QuickCheck quickcheck-instances resourcet text time + transformers ]; testDepends = [ aeson aws aws-general base bytestring errors mtl QuickCheck tagged @@ -21313,8 +21454,8 @@ self: { }: mkDerivation { pname = "aws-kinesis-client"; - version = "0.3.0.1"; - sha256 = "020vv9aaqfxpgrpviy0y6i0448rypr7rg5cvzbmn46n96jyww12w"; + version = "0.3.0.2"; + sha256 = "0p1544yq9cs9qz9za2gcsdvd8wkq66sa0kzzv3i2c6xjbqy0wpgr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21651,8 +21792,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.4.0"; - sha256 = "0cwx7irpzbl1g3wi4fcdjrkv2968517gljyvc9w8vm6f81wr2xcb"; + version = "0.4.1"; + sha256 = "1zylnxh6r6sbk6fyx3b5hh6msajrrr07nsb4hwqlh07n1zzavw7j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22025,7 +22166,9 @@ self: { mkDerivation { pname = "barrier"; version = "0.1.0"; + revision = "1"; sha256 = "1flhgx323dnqhh6gxmfv4m8qj2yysckrr9pzw0g7jisvk6pmcz4z"; + editedCabalFile = "2f75bd296d54424250895888d24eaec14bbdb35b355306306b6f8632052473bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22053,26 +22196,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "base_4_7_0_2" = callPackage - ({ mkDerivation, ghc-prim, integer-gmp, rts }: + "base_4_8_0_0" = callPackage + ({ mkDerivation, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.7.0.2"; - sha256 = "09rp0syv5arj7wmyksmn07g7vps1kwh2k4z1ar1dp7jsav8gxsjp"; - buildDepends = [ ghc-prim integer-gmp rts ]; + version = "4.8.0.0"; + sha256 = "1mf5s7niw0zmm1db7sr6kdpln8drcy77fn44h6sspima8flwcp44"; + buildDepends = [ ghc-prim rts ]; + jailbreak = true; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; }) {}; "base-compat" = callPackage - ({ mkDerivation, base, errorcall-eq-instance, hspec, QuickCheck - , setenv - }: + ({ mkDerivation, base, hspec, QuickCheck, setenv }: mkDerivation { pname = "base-compat"; - version = "0.5.0"; - sha256 = "1zlpfpfnaqf8rrha19arh882bc560dcw2zwi4j3qrn3lzyh8s1d1"; - buildDepends = [ base errorcall-eq-instance setenv ]; + version = "0.6.0"; + sha256 = "1ry85ymd0m99z2g45x7nlvpda699xa6zzn8l51im5bda6zsczlyv"; + buildDepends = [ base setenv ]; testDepends = [ base hspec QuickCheck ]; description = "A compatibility layer for base"; license = stdenv.lib.licenses.mit; @@ -22094,8 +22236,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "base-prelude"; - version = "0.1.16"; - sha256 = "1k7rbbmw6qjqql7408vaj3mcymlk66hyrd0l2xhksyalh1h4sbps"; + version = "0.1.19"; + sha256 = "00mk7zpm3yb804h0gngvpjxhb2a6nds8qb8mwpn80s20x72083wb"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; @@ -22243,6 +22385,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basic-lens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "basic-lens"; + version = "0.0.0"; + revision = "1"; + sha256 = "0qgd2066vgsrzglcmw1jd7lcrpxvrzch7bnyyfxzddwxj148mvnj"; + editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170"; + buildDepends = [ base ]; + description = "Basic lens type and functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "basic-prelude" = callPackage ({ mkDerivation, base, bytestring, containers, hashable , lifted-base, ReadArgs, safe, system-filepath, text, transformers @@ -23071,8 +23226,8 @@ self: { }: mkDerivation { pname = "binary-list"; - version = "1.0.1.0"; - sha256 = "1d83ka79nnq5pw4djs6x3ccgygkq89q9wakgykx4wvyf7l0xj7d9"; + version = "1.1.0.2"; + sha256 = "006a46yw1jcdw2yhpwimbjcpls0vrhzrhiylxh6vc136w2kb6qcd"; buildDepends = [ base binary bytestring deepseq phantom-state transformers ]; @@ -23453,6 +23608,7 @@ self: { mkDerivation { pname = "bindings-codec2"; version = "0.1.1.0"; + revision = "1"; sha256 = "0mpb79djfqi0had6rx20jsgahdfv23bnp0i25lbxv8vg72m3wdnn"; editedCabalFile = "48e69a5b497247c96ab7a6ed3ff818bef596c712249819e63a84c4667ef5d0b1"; isLibrary = true; @@ -23613,6 +23769,7 @@ self: { mkDerivation { pname = "bindings-hamlib"; version = "0.1.0.0"; + revision = "1"; sha256 = "1na9v5s5lqdnnj031zmqg3xfpsvy80gzr7qg0f3gsyyniww72xlz"; editedCabalFile = "1eea9735be1dd9f54d91406fbf56da41b8d68a3760ada5e4fc4caf0658c997c9"; isLibrary = true; @@ -24220,22 +24377,20 @@ self: { }) {}; "bit-vector" = callPackage - ({ mkDerivation, base, QuickCheck, test-framework - , test-framework-quickcheck2, vector + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , tasty-th, vector }: mkDerivation { pname = "bit-vector"; - version = "0.1.0"; - sha256 = "1z2gk5wbl865p893hz77jkg7lyl6698va5r33fi7w1vv8656s14n"; + version = "0.2.0"; + sha256 = "1h3hm1akbj2qzl3df877hfgz3fanhvrj6czxvjbpcalpf3d6h5z1"; buildDepends = [ base vector ]; testDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 vector + base QuickCheck tasty tasty-quickcheck tasty-th vector ]; - jailbreak = true; homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitarray" = callPackage @@ -24620,7 +24775,6 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blakesum" = callPackage @@ -24733,7 +24887,6 @@ self: { version = "0.1.0.0"; sha256 = "1q1gwjg8xfp20lrlrlkdprny7j437fsnm5c9p5rv4549nyam7prw"; buildDepends = [ base blaze-html text ]; - jailbreak = true; homepage = "http://github.com/agrafix/blaze-bootstrap"; description = "Blaze helper functions for bootstrap pages"; license = stdenv.lib.licenses.mit; @@ -24784,14 +24937,15 @@ self: { "blaze-builder-enumerator" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, enumerator - , transformers + , streaming-commons, transformers }: mkDerivation { pname = "blaze-builder-enumerator"; - version = "0.2.0.6"; - sha256 = "0pdw18drvikb465qh43b8wjyvpqj3wcilyczc21fri5ma4mxdkyp"; + version = "0.2.0.7"; + sha256 = "1ipfx99d3amgpl63lpby88qczgxb5wbw52srpy94phynw9xpxnvk"; buildDepends = [ - base blaze-builder bytestring enumerator transformers + base blaze-builder bytestring enumerator streaming-commons + transformers ]; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; @@ -24812,6 +24966,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_7_0_3" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.7.0.3"; + sha256 = "1jn3vvrxb3ifxb5yzs76pjlk8c366xg1sab7qlw9a4kwmigvl6vx"; + buildDepends = [ base blaze-builder blaze-markup bytestring text ]; + testDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-html" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework @@ -24819,8 +24993,28 @@ self: { }: mkDerivation { pname = "blaze-html"; - version = "0.8.0.0"; - sha256 = "05afa3g9fbr0hnw8x794d7s8vzr0il9lkc2w67ks7hli78wl1y5b"; + version = "0.7.1.0"; + sha256 = "0krvyik9hdizvyx3r499vah34b1jnnv4ivm9h1ij7rgh9xjw34ja"; + buildDepends = [ base blaze-builder blaze-markup bytestring text ]; + testDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-html_0_8_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.8.0.2"; + sha256 = "1h3z857kqj9h87zyi84pck2rnykfk7i4amlh0vkv5wws5zn9xs74"; buildDepends = [ base blaze-builder blaze-markup bytestring text ]; testDepends = [ base blaze-builder blaze-markup bytestring containers HUnit @@ -24880,6 +25074,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_6_2_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.6.2.0"; + sha256 = "034aqkvxw0g6ry4d82bkvxky7w6yx4q6bp1wn4ydj9rqw8yh6m08"; + buildDepends = [ base blaze-builder bytestring text ]; + testDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-markup" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -24887,14 +25100,32 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.7.0.0"; - sha256 = "0ifjf6n7hzcc11g3lhwdmzxs2qa3va7snn5m7i948gbffpkkr3pp"; + version = "0.6.3.0"; + sha256 = "1x057jlp89js6xbbyp4ky7xf5wq1ckl516b8bzp4y3knz50jshll"; + buildDepends = [ base blaze-builder bytestring text ]; + testDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "blaze-markup_0_7_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.7.0.2"; + sha256 = "0p3jsl7ng3fapvbp431cm1bckdwjgc1kmijyvxlgxn1l90l8l1p4"; buildDepends = [ base blaze-builder bytestring text ]; testDepends = [ base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -25138,19 +25369,23 @@ self: { }) {}; "blunt" = callPackage - ({ mkDerivation, array, base, bytestring, containers - , haskell-src-exts, http-types, transformers, wai, warp + ({ mkDerivation, aeson, array, base, bytestring, clay, containers + , haskell-src-exts, http-types, jmacro, lucid, pointful, text + , transformers, wai, wai-extra, wai-websockets, warp, websockets + , wl-pprint-text }: mkDerivation { pname = "blunt"; - version = "0.0.7"; - sha256 = "01hm0349qzam2ygsdhcg55kgzh6gk22m6hrjb6lk5gqsn6xsdf4w"; + version = "0.0.15"; + sha256 = "122gic92hibcic7yrk3anp1rbwlpxkv87cigbz49zvxdjr9c7d6y"; isLibrary = true; isExecutable = true; buildDepends = [ - array base bytestring containers haskell-src-exts http-types - transformers wai warp + aeson array base bytestring clay containers haskell-src-exts + http-types jmacro lucid pointful text transformers wai wai-extra + wai-websockets warp websockets wl-pprint-text ]; + homepage = "https://blunt.herokuapp.com"; description = "Point-free Haskell as a service"; license = stdenv.lib.licenses.mit; }) {}; @@ -25331,6 +25566,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "borel" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava + , ceilometer-common, chevalier-common, configurator, containers + , either, errors, hslogger, hspec, lens, lens-properties, marquise + , mtl, multiset, network, network-uri, pipes, pipes-concurrency + , pipes-safe, QuickCheck, text, time, transformers + , unordered-containers, vaultaire-common, vector, zeromq4-haskell + }: + mkDerivation { + pname = "borel"; + version = "0.18.0"; + sha256 = "0daayl70l8afpf6l4822nz2cqjy2k8zbrj89apipjbynsq543453"; + buildDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers errors hslogger lens + marquise mtl multiset network network-uri pipes pipes-concurrency + pipes-safe text time transformers unordered-containers + vaultaire-common vector zeromq4-haskell + ]; + testDepends = [ + aeson async attoparsec base bimap cassava ceilometer-common + chevalier-common configurator containers either errors hslogger + hspec lens lens-properties marquise mtl multiset network + network-uri pipes pipes-concurrency pipes-safe QuickCheck text time + transformers unordered-containers vaultaire-common vector + zeromq4-haskell + ]; + homepage = "https://github.com/anchor/borel-core"; + description = "Metering System for OpenStack metrics provided by Vaultaire"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bot" = callPackage ({ mkDerivation, arrows, base, Stream }: mkDerivation { @@ -25379,6 +25647,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bound-gen" = callPackage + ({ mkDerivation, base, bound, monad-gen, mtl }: + mkDerivation { + pname = "bound-gen"; + version = "0.1.0.2"; + sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp"; + buildDepends = [ base bound monad-gen mtl ]; + jailbreak = true; + description = "Unwrap Scope's with globally fresh values"; + license = stdenv.lib.licenses.mit; + }) {}; + "bounded-tchan" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -25945,8 +26225,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.4.7"; - sha256 = "1fc8y2incvci9ib9gkbr03shjj8fwxsb5q34phwycmqiaq3j5c88"; + version = "0.4.8"; + sha256 = "0ra4hvym5f4w8hy7p11apb5n0pdsq5iv56wab513dhb75562ipcq"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -25958,9 +26238,8 @@ self: { hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework test-framework-hunit text ]; - description = "Draw pretty sequence diagrams of D-Bus traffic"; + description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bv" = callPackage @@ -26035,6 +26314,7 @@ self: { mkDerivation { pname = "bytes"; version = "0.15"; + revision = "1"; sha256 = "0898qlpf74ax33hm6hbla9kcjrldk26sc5yj3gdp99yb3qb5swz6"; editedCabalFile = "94dc3ad697fbfd70c7cf77a2e0c9bf4307a0f396012738537b931fc3b4e58386"; buildDepends = [ @@ -26047,16 +26327,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_4_1" = callPackage + "bytestring_0_10_6_0" = callPackage ({ mkDerivation, base, byteorder, deepseq, directory, dlist , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "bytestring"; - version = "0.10.4.1"; - sha256 = "1zldh1pifmyrn7m3di6xz9kw9jfm0syr2fpqh1lwfics9il4cjdg"; - editedCabalFile = "4f35a46a32774b82712c560de811bf76ef4e9a8302fe67f2e00129c4b5eface3"; + version = "0.10.6.0"; + sha256 = "0xw924djdbs15r4dh2zyn209b0ji94si4ywliagjbg41gdmrl6r7"; buildDepends = [ base deepseq ghc-prim integer-gmp ]; testDepends = [ base byteorder deepseq directory dlist ghc-prim HUnit mtl @@ -26098,6 +26377,7 @@ self: { mkDerivation { pname = "bytestring-class"; version = "0.0.0.1"; + revision = "1"; sha256 = "1z65br00rplhniaw9fg3phpxwf13acgycn5hnhyjfcyr962xp03x"; editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417"; buildDepends = [ base bytestring utf8-string ]; @@ -26254,8 +26534,8 @@ self: { }: mkDerivation { pname = "bytestring-read"; - version = "0.2.0"; - sha256 = "08622w2n7aphnv5wyisd5bz7r4nbyb1f86f4g1yia0r3x687sp5a"; + version = "0.3.0"; + sha256 = "19bq478066chy35fnfjq5bg2f196zl6qi2dssqwlr9bivgvk434g"; buildDepends = [ base bytestring types-compat ]; testDepends = [ base bytestring doctest tasty tasty-quickcheck ]; homepage = "https://github.com/philopon/bytestring-read"; @@ -26278,6 +26558,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bytestring-short" = callPackage + ({ mkDerivation, base, bytestring, deepseq, QuickCheck }: + mkDerivation { + pname = "bytestring-short"; + version = "0.0.1.0"; + sha256 = "034c63hw49sy4mg6xarf61d4f3shafj66v4sqky04sin460s28wv"; + buildDepends = [ base bytestring deepseq ]; + testDepends = [ base bytestring QuickCheck ]; + jailbreak = true; + description = "Backport copy of ShortByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-show" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , integer-gmp @@ -26421,7 +26715,6 @@ self: { buildDepends = [ base c0parser ]; description = "Simple C0 Syntax Check"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c0parser" = callPackage @@ -26433,7 +26726,6 @@ self: { buildDepends = [ base parsec ]; description = "Simple C0 Parser"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c10k" = callPackage @@ -26479,8 +26771,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.24.1"; - sha256 = "0625lpilklch3sifp2vmllq5z0vbksln9kvs86dqsx4x4hnc66yk"; + version = "0.25.2"; + sha256 = "0d1rgcwvz49v3h511dibiv6m06v8s179pg4sw386z17pz3a2hghm"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26644,8 +26936,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.24.3"; - sha256 = "0vhsdnjhrh2i78ncn7jmqszr0zha1ib1ja2xxsamgnz0zps0aiwx"; + version = "4.24.8"; + sha256 = "13csdlk33ik0jskapy56i7fza6hxh59y2c2yy02ha3himvrm8q77"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -26716,6 +27008,7 @@ self: { mkDerivation { pname = "cabal-file-th"; version = "0.2.3"; + revision = "1"; sha256 = "0kawvb5n56rkq4453l6pia3wrr6jvvdwkghi6i176n1gm2zf2ri8"; editedCabalFile = "50bc6cf5a335a2608ab1e5e59b73f184d3f48d91f49fec189701416ff3e1e37e"; buildDepends = [ base Cabal directory template-haskell ]; @@ -26760,22 +27053,57 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, data-default, directory - , filepath, mtl, process, template-haskell, temporary, transformers + , filepath, ghc-prim, mtl, process, template-haskell, temporary + , transformers }: mkDerivation { pname = "cabal-helper"; - version = "0.2.0.0"; - sha256 = "0p0p5f786y50gc54w8x25hkdi5dz7y63rrkq17h36p0jxjggmipm"; + version = "0.3.0.0"; + revision = "1"; + sha256 = "1yrv5amv8g4r07z47j7082xhxhfim6d089ib2dnv0b6iik3xfyfv"; + editedCabalFile = "dc30481b4261dae5151f3f4d6fba41c8c2e6415b8cc4dc7df9c08284febb453d"; isLibrary = true; isExecutable = true; buildDepends = [ - base bytestring Cabal data-default directory filepath mtl process - template-haskell temporary transformers + base bytestring Cabal data-default directory filepath ghc-prim mtl + process template-haskell temporary transformers ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-install_1_18_0_8" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , directory, filepath, HTTP, HUnit, mtl, network, network-uri + , pretty, process, QuickCheck, random, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, time, unix + , zlib + }: + mkDerivation { + pname = "cabal-install"; + version = "1.18.0.8"; + sha256 = "1yx7vgyi2hs934z4ln7d8m2yrsakidb551ib01l9hxnmc3jbskwi"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + array base bytestring Cabal containers directory filepath HTTP mtl + network network-uri pretty process random stm time unix zlib + ]; + testDepends = [ + array base bytestring Cabal containers directory filepath HTTP + HUnit mtl network network-uri pretty process QuickCheck stm + test-framework test-framework-hunit test-framework-quickcheck2 time + unix zlib + ]; + postInstall = '' + mkdir $out/etc + mv bash-completion $out/etc/bash_completion.d + ''; + homepage = "http://www.haskell.org/cabal/"; + description = "The command-line interface for Cabal and Hackage"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-install" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl @@ -26785,9 +27113,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "1.22.0.1"; - sha256 = "1j0h1m963kimkk07aag57bgalscly0mhcwgzm7zzxymzsbssibw7"; - editedCabalFile = "85c5296e1b0aff3717c9ce62e98a8b9b6d5509e55f76cd80ae7179269c46592c"; + version = "1.22.2.0"; + sha256 = "1nvamsklmxc77mivi02li5rijiliajl4x620pwchzgb0iyl2xg15"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -26910,8 +27237,8 @@ self: { }: mkDerivation { pname = "cabal-meta"; - version = "0.4.1.2"; - sha256 = "17ln9j0n9rb0kbnp37fi9yaf932dacrdmf3jrp301r886kh2a7kk"; + version = "0.4.1.3"; + sha256 = "14k8nv2kg8n9ssz6jivvin56jjazsvp4xg7zi0z6hcawfmcdmzd6"; isLibrary = true; isExecutable = true; buildDepends = [ base shelly system-fileio system-filepath text ]; @@ -26921,6 +27248,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-mon" = callPackage + ({ mkDerivation, base, containers, directory, filepath, process + , simple-get-opt, vty + }: + mkDerivation { + pname = "cabal-mon"; + version = "1.0.1"; + sha256 = "1wngmf73dqyyf9nfbpwyg3mvbp32rqrhhp4kf9nylhawwkv7c8v0"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + base containers directory filepath process simple-get-opt vty + ]; + description = "A monitor for cabal builds"; + license = stdenv.lib.licenses.mit; + }) {}; + "cabal-nirvana" = callPackage ({ mkDerivation, base, bytestring, containers, directory, HTTP , process, tar @@ -27124,9 +27468,10 @@ self: { ({ mkDerivation, base, Cabal, QuickCheck }: mkDerivation { pname = "cabal-test-quickcheck"; - version = "0.1.4"; - sha256 = "012pl06x5jjiyhc98x5245zj1lcgkr9wcyv3rjc6z59y8mynv7ri"; + version = "0.1.6"; + sha256 = "0rffvz3khxdfbl9rfk1q47xqv013dwmd4sy8cy7y833175j2zibi"; buildDepends = [ base Cabal QuickCheck ]; + jailbreak = true; homepage = "https://github.com/zmthy/cabal-test-quickcheck"; description = "QuickCheck for Cabal"; license = stdenv.lib.licenses.mit; @@ -27577,7 +27922,6 @@ self: { homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caldims" = callPackage @@ -27619,24 +27963,25 @@ self: { }) {}; "call" = callPackage - ({ mkDerivation, base, bindings-portaudio, boundingboxes, colors - , containers, control-bool, deepseq, directory, filepath, free - , freetype2, GLFW-b, hashable, JuicyPixels, JuicyPixels-util, lens - , linear, mtl, objective, OpenGL, OpenGLRaw, random - , template-haskell, text, transformers, vector, WAVE + ({ mkDerivation, audiovisual, base, bindings-portaudio + , boundingboxes, colors, containers, control-bool, deepseq + , directory, filepath, free, freetype2, GLFW-b, hashable + , JuicyPixels, JuicyPixels-util, lens, linear, mtl, objective + , OpenGL, OpenGLRaw, random, reflection, template-haskell, text + , transformers, vector, WAVE }: mkDerivation { pname = "call"; - version = "0.1.4.2"; - sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g"; + version = "0.2"; + sha256 = "1hbzrhhx0cjgpxiq3200n38pl2m2y727zfmgfdfs45l1hqbvrldp"; isLibrary = true; isExecutable = true; buildDepends = [ - base bindings-portaudio boundingboxes colors containers + audiovisual base bindings-portaudio boundingboxes colors containers control-bool deepseq directory filepath free freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util lens linear mtl objective - OpenGL OpenGLRaw random template-haskell text transformers vector - WAVE + OpenGL OpenGLRaw random reflection template-haskell text + transformers vector WAVE ]; jailbreak = true; homepage = "https://github.com/fumieval/call"; @@ -27784,8 +28129,8 @@ self: { }: mkDerivation { pname = "caramia"; - version = "0.7.2.0"; - sha256 = "0jndbw3xr5h9r0f8z4fplqxw02icfakr4j41yvfsw398yb94i8f0"; + version = "0.7.2.1"; + sha256 = "01l6i8cb2q73vc4w6fbn90mkx7sxxsnwzhj0jg4yjhnrg4js0hlh"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -27856,18 +28201,18 @@ self: { "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck - , quickpull, random, time, transformers + , random, tasty, tasty-quickcheck, tasty-th, time, transformers }: mkDerivation { pname = "cartel"; - version = "0.14.2.2"; - sha256 = "0ikf0jhiaqagd4ycq9szs4vy7yq7ai31yzcj8f0a6i3j6j4cr8nx"; + version = "0.14.2.6"; + sha256 = "05m4b8gi5ysx73yzlhl27fx9i8fnlihxwsyh6a0702kzwgn40icc"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath time transformers ]; testDepends = [ - base directory filepath multiarg QuickCheck quickpull random time - transformers + base directory filepath multiarg QuickCheck random tasty + tasty-quickcheck tasty-th time transformers ]; homepage = "http://www.github.com/massysett/cartel"; description = "Specify Cabal files in Haskell"; @@ -27881,8 +28226,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.2.0.8"; - sha256 = "131r3l1psacb3mps02mqc4vjdghn2w5jwz2j6khr7w6bk13qlpj0"; + version = "2.3.0.0"; + sha256 = "0znzn73c6cc7jyj460djlhzydkw9jqxhjm62kiz5pv2j7bvpv7aw"; buildDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear vector vector-binary-instances @@ -27916,8 +28261,8 @@ self: { ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }: mkDerivation { pname = "casadi-bindings-core"; - version = "2.2.0.2"; - sha256 = "1cpz8jzmcn5zx7bqm8920yrydhispgca8kijsq1zk5xnjasm5kva"; + version = "2.3.0.0"; + sha256 = "1n892agqknwjs2paszafp6b1xgiz8zfmlxqb2wm0d99487175lcv"; buildDepends = [ base casadi-bindings-internal vector ]; pkgconfigDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; @@ -27929,8 +28274,8 @@ self: { ({ mkDerivation, base, casadi, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.2.1"; - sha256 = "0sh7j11pgrnmvcrdvvvvld2k0kbvccmh67rmbravshgx95nx7dli"; + version = "0.1.3.0"; + sha256 = "1kazy8xppydbl6gkdn1y1gv2lz38sif6i92crkxb476xz0fvmf00"; buildDepends = [ base vector ]; pkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; @@ -28088,17 +28433,17 @@ self: { "cassava" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, ghc-prim, HUnit, QuickCheck, test-framework + , containers, deepseq, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text , unordered-containers, vector }: mkDerivation { pname = "cassava"; - version = "0.4.2.2"; - sha256 = "0apprj3qqxhwkplfzmhsi9x0a2acg8crxm28r3wl0vrk58rczvrf"; + version = "0.4.2.3"; + sha256 = "13fhim3ylxhkr7wy5dss3m1k3cqlhrvknzbqsi1yclfkvp4wzc2f"; buildDepends = [ array attoparsec base blaze-builder bytestring containers deepseq - ghc-prim text unordered-containers vector + text unordered-containers vector ]; testDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -28233,6 +28578,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "catamorphism" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "catamorphism"; + version = "0.4.0.0"; + sha256 = "00gyb84jfb19n4g0igm4sikqk2bl96wj9293g82rjxgrk9m19iq7"; + buildDepends = [ base template-haskell ]; + homepage = "http://github.com/frerich/catamorphism"; + description = "A package exposing a helper function for generating catamorphisms"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "catch-fd" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -28316,8 +28673,8 @@ self: { }: mkDerivation { pname = "cayley-client"; - version = "0.1.1.0"; - sha256 = "0avwd6mgn3g1avrwb85v4vp598x00v4566iqsxgp857cbrrh5096"; + version = "0.1.2.1"; + sha256 = "0c2n37p8530awkpwnygrpz7zssv22ycjjml2623f61x7q8ilb8p6"; buildDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -28325,7 +28682,7 @@ self: { ]; jailbreak = true; homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "An Haskell client for Cayley graph database"; + description = "A Haskell client for Cayley graph database"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28428,8 +28785,8 @@ self: { }: mkDerivation { pname = "ceilometer-common"; - version = "0.2.2"; - sha256 = "01lvjyl884i6qcfxr7xj42g5spn1fx3jgcq1g8zv0b5y9jwpj7lr"; + version = "0.2.3"; + sha256 = "1zqqh7k627yw6vfcdihl2gw8hh3l9gxj283azmmcc9pm15grblps"; buildDepends = [ base bimap binary bytestring containers foldl lens pipes siphash template-haskell text vaultaire-common @@ -28440,7 +28797,7 @@ self: { text transformers vaultaire-common ]; homepage = "https://github.com/anchor/ceilometer-common"; - description = "Common Haskell types and encoding for ceilometer"; + description = "Common Haskell types and encoding for OpenStack Ceilometer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28600,6 +28957,7 @@ self: { mkDerivation { pname = "cf"; version = "0.1"; + revision = "1"; sha256 = "0wwq78b6d6hxaivyxw8rc9dsb0kq4aw0mkp8w0xmnfmz8biymlmg"; editedCabalFile = "6bd39af35810e6a40142d87fdd9fc91754fe85098a63a8087626bf9916bd3362"; buildDepends = [ base ]; @@ -28691,8 +29049,8 @@ self: { }: mkDerivation { pname = "cgi"; - version = "3001.2.2.0"; - sha256 = "0zl1ib0i0sh6ll3mrakaargjxyr3v2kxzzdfqpjnr57pg7isrjx9"; + version = "3001.2.2.1"; + sha256 = "1cpljh62mw2fim5gwpd0ag9ais9953iyiiwqfbd2nb6swy5k1z1m"; buildDepends = [ base bytestring containers exceptions mtl multipart network network-uri old-locale old-time parsec xhtml @@ -28721,6 +29079,7 @@ self: { mkDerivation { pname = "cgi-utils"; version = "0.2.1"; + revision = "1"; sha256 = "0msljq31bz40hsrhhq9qhxrgmdlqq32l3ykcy4wviv8kmc3dic7p"; editedCabalFile = "df1cb1e658d9b79adde373fc31a1d7553a4803f8967c760abf233e75913ddd52"; buildDepends = [ base cgi containers mtl random ]; @@ -29039,7 +29398,6 @@ self: { aeson base blaze-html bytestring containers data-default http-types mtl syb text uniplate wai wai-extra xss-sanitize ]; - jailbreak = true; homepage = "http://github.com/jgm/cheapskate"; description = "Experimental markdown processor"; license = stdenv.lib.licenses.bsd3; @@ -29094,8 +29452,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; - version = "0.4.1"; - sha256 = "19ndgbivd07vchsqs6z9iqjl2jldbq7h4skqc9acracd9xyq1vdr"; + version = "0.4.2"; + sha256 = "0v2qvd0g0k2j3h07003wc2vkrknq6y3ld1qgh69j4r6049x9qhaj"; buildDepends = [ array base QuickCheck random ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; @@ -29134,8 +29492,8 @@ self: { ({ mkDerivation, base, chell, QuickCheck, random }: mkDerivation { pname = "chell-quickcheck"; - version = "0.2.4"; - sha256 = "0ys6aks97y5h0n8n8dmwx8jrai4bjlnr7n69s259664y694054wd"; + version = "0.2.5"; + sha256 = "02bkcnx5k6r5csdnnkvk4wfd0l36nxb87i1463ynw17n7ym9s4cs"; buildDepends = [ base chell QuickCheck random ]; homepage = "https://john-millikin.com/software/chell/"; description = "QuickCheck support for the Chell testing library"; @@ -29154,6 +29512,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chevalier-common" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, cereal, locators + , mtl, network, network-uri, protobuf, text, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "chevalier-common"; + version = "0.6.0"; + sha256 = "0fg7cb5ds2ixk046isz6wala7azaxqlfsacb1p7l9j6din9mgzrs"; + buildDepends = [ + base bifunctors bytestring cereal locators mtl network network-uri + protobuf text unordered-containers vaultaire-common zeromq4-haskell + ]; + description = "Query interface for Chevalier"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chp" = callPackage ({ mkDerivation, base, containers, deepseq, extensible-exceptions , pretty, stm @@ -29574,7 +29949,6 @@ self: { homepage = "http://istitutocolli.org/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "citeproc-hs-pandoc-filter" = callPackage @@ -29661,7 +30035,9 @@ self: { mkDerivation { pname = "clafer"; version = "0.3.9"; + revision = "1"; sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr"; + editedCabalFile = "7a77fc544dc4aab21ecf747c8d95acd0d94cf9d001824862f859682eca953d22"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -29674,6 +30050,7 @@ self: { base containers data-stringmap directory filepath ghc HaXml HUnit lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th ]; + jailbreak = true; homepage = "http://clafer.org"; description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot"; license = stdenv.lib.licenses.mit; @@ -29812,8 +30189,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.7"; - sha256 = "0mp8wly3h0kjkn3c6wq7v6sl79s9fmdmil70dj2xgmf82i02a9fr"; + version = "0.7.1"; + sha256 = "1hy1bx83faf0n3irp0g2136bmd9gvpd638ap8ifys6gdni25k3zv"; buildDepends = [ base data-default ghc-prim integer-gmp singletons template-haskell th-lift @@ -29899,7 +30276,7 @@ self: { "classy-prelude" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, enclosed-exceptions, exceptions + , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl , mutable-containers, old-locale, primitive, QuickCheck, semigroups , stm, system-filepath, text, time, transformers @@ -29907,11 +30284,11 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "0.10.5"; - sha256 = "1s9hydjs7x522w9hgrxjzx1d2zir80g140y4vdqd7mizv0yzisy3"; + version = "0.11.0"; + sha256 = "07fqmmsirf83xkb1mc3jaklq47cbdx3slp4f60m6bhnmlg7zjdnf"; buildDepends = [ base basic-prelude bifunctors bytestring chunked-data containers - enclosed-exceptions exceptions ghc-prim hashable lifted-base + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base mono-traversable mtl mutable-containers old-locale primitive semigroups stm system-filepath text time transformers unordered-containers vector vector-instances @@ -29931,8 +30308,8 @@ self: { }: mkDerivation { pname = "classy-prelude-conduit"; - version = "0.10.5"; - sha256 = "1dy9jj260hn571z1wdm0v5zpgalwgij99clmh541b41h6pjbism2"; + version = "0.11.0"; + sha256 = "1ahz02q5qc7abax85m28d7gjnppghf772bqy0wlw39ngp3z6ch81"; buildDepends = [ base bytestring classy-prelude conduit conduit-combinators monad-control resourcet system-fileio transformers void @@ -29952,8 +30329,8 @@ self: { }: mkDerivation { pname = "classy-prelude-yesod"; - version = "0.10.5"; - sha256 = "0phaczjsn3blca3y6cwnqwhd9wrl7im1r2kh4i6a83c9kirsa5cx"; + version = "0.11.0"; + sha256 = "1i0s0hgc57dizbw5s17f894ssdmglh6sw8jwpxcsh8hzqdw7jrqc"; buildDepends = [ aeson base classy-prelude classy-prelude-conduit data-default http-conduit http-types persistent yesod yesod-newsfeed @@ -30211,6 +30588,7 @@ self: { mkDerivation { pname = "cld2"; version = "0.1.0.1"; + revision = "1"; sha256 = "0fsjp0y5f17gv3k43vbxgx7w6i2l4ralrc6g1wb0xi0gp1vrm3hd"; editedCabalFile = "60506ceb359329f803a733a06f9a6060a31cab7e86dd4a8e3fd843953cb4cfbd"; buildDepends = [ base bytestring text ]; @@ -30263,6 +30641,7 @@ self: { homepage = "https://github.com/tanakh/cless"; description = "Colorized LESS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clevercss" = callPackage @@ -30310,7 +30689,6 @@ self: { jailbreak = true; description = "Toy game (tetris on billiard board). Hipmunk in action."; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clientsession" = callPackage @@ -30414,11 +30792,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "clist" = callPackage + ({ mkDerivation, base, base-unicode-symbols, peano }: + mkDerivation { + pname = "clist"; + version = "0.1.0.0"; + sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd"; + buildDepends = [ base base-unicode-symbols peano ]; + jailbreak = true; + homepage = "https://github.com/strake/clist.hs"; + description = "Counted list"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "clock" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "clock"; version = "0.4.1.3"; + revision = "1"; sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d"; editedCabalFile = "653fd69fcb84f23fb93241604f83f686921593f7ded7c3bf61ce7cecf1f00440"; buildDepends = [ base ]; @@ -30614,8 +31007,8 @@ self: { }: mkDerivation { pname = "clustering"; - version = "0.1.1"; - sha256 = "1xjsbpp6xl5nbp9v14jad8nrzylg4vbn1s6skzdknk36midds2ws"; + version = "0.1.2"; + sha256 = "0idmh6k6j4dmnaf8zsvw30lkwsgk5hqvp4hlzfd4j6d9ah2pwmfp"; buildDepends = [ base binary containers matrices mwc-random primitive vector ]; @@ -30679,12 +31072,13 @@ self: { }) {}; "cmark" = callPackage - ({ mkDerivation, base, mtl, text }: + ({ mkDerivation, base, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.0.1"; - sha256 = "1n73ya2r5dbsadmx9y6l931k7nhppqa69qqyv15pnm3w7823njj8"; - buildDepends = [ base mtl text ]; + version = "0.3.1"; + sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb"; + buildDepends = [ base text ]; + testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; description = "Fast, accurate CommonMark (Markdown) parser and renderer"; license = stdenv.lib.licenses.bsd3; @@ -30729,6 +31123,7 @@ self: { mkDerivation { pname = "cmdargs"; version = "0.10.12"; + revision = "1"; sha256 = "0axn3ycw4rijh1ka5f73gz9w330s851cpxbv39ia4xnb0l95hrjy"; editedCabalFile = "e37c92e6337ccbacd95f77938a1d0459f52cdb1a51c920a96610793cf2b5e4dc"; isLibrary = true; @@ -30958,6 +31353,7 @@ self: { mkDerivation { pname = "codepad"; version = "0.1"; + revision = "1"; sha256 = "03jvbbv4cgrmk0ihz34shd1ydv5jhl1h1xiwqrln60622jlh8mr1"; editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a"; buildDepends = [ base curl mtl network tagsoup ]; @@ -31593,6 +31989,7 @@ self: { mkDerivation { pname = "compdata-automata"; version = "0.9"; + revision = "1"; sha256 = "1hlv6a4ywlnr86pzrlffqbg55mfkrkkxn2yir6a28bdirgi69fkf"; editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130"; buildDepends = [ base compdata containers projection ]; @@ -31608,6 +32005,7 @@ self: { mkDerivation { pname = "compdata-dags"; version = "0.1"; + revision = "1"; sha256 = "1ijr3lpl0g5l5xynnwwzj4rflgfgw1y2b4ldabbw5qlk4qa0gr5j"; editedCabalFile = "556bbb62f4b8b6d738a20775066342b4d911fed945729da5aea072fd5df65044"; buildDepends = [ @@ -31784,6 +32182,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compstrat" = callPackage + ({ mkDerivation, base, compdata, mtl, template-haskell + , th-expand-syns, transformers + }: + mkDerivation { + pname = "compstrat"; + version = "0.1.0.2"; + sha256 = "1jdxvyqkszwkry3vly65nh80519cpfw4ghzg1lsbnhyrbhvlchkg"; + buildDepends = [ + base compdata mtl template-haskell th-expand-syns transformers + ]; + description = "Strategy combinators for compositional data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "comptrans" = callPackage + ({ mkDerivation, base, compdata, containers, deepseq + , deepseq-generics, ghc-prim, lens, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "comptrans"; + version = "0.1.0.4"; + sha256 = "01yv0j405ninkvmfx7r4cwzvxdhcdivncds46086s1v0qmp2zag0"; + buildDepends = [ + base compdata containers deepseq deepseq-generics ghc-prim lens + template-haskell th-expand-syns + ]; + homepage = "https://github.com/jkoppel/comptrans"; + description = "Automatically converting ASTs into compositional data types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "computational-algebra" = callPackage ({ mkDerivation, algebra, base, containers, equational-reasoning , heaps, lens, monad-loops, monomorphic, peggy, singletons @@ -31822,8 +32253,8 @@ self: { }: mkDerivation { pname = "conceit"; - version = "0.2.2.0"; - sha256 = "0h477bn361b0g3iq1nzx88pii8zhkc41vk1f0ggndhidnzddrlb8"; + version = "0.2.2.1"; + sha256 = "0phr04cp36n5r137la3vh92v7wbc5a56grpfynn2vjiyacmrw0b4"; buildDepends = [ base bifunctors exceptions mtl semigroupoids transformers void ]; @@ -32035,8 +32466,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, hashable }: mkDerivation { pname = "concurrent-supply"; - version = "0.1.7"; - sha256 = "0crg4rm5wibw9h6lmsi43d280xg1xr9xbgqr9s4inxq7x0yyn68c"; + version = "0.1.7.1"; + sha256 = "050d1k4hvjjyap3w8spcx57lagnh77z131jbgsndpc9mjx8r4l5y"; buildDepends = [ base ghc-prim hashable ]; testDepends = [ base containers ]; homepage = "http://github.com/ekmett/concurrent-supply/"; @@ -32180,6 +32611,71 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-audio" = callPackage + ({ mkDerivation, base, conduit, vector }: + mkDerivation { + pname = "conduit-audio"; + version = "0.1"; + sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb"; + buildDepends = [ base conduit vector ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "Combinators to efficiently slice and dice audio streams"; + license = "LGPL"; + }) {}; + + "conduit-audio-lame" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-audio, mp3lame + , resourcet, transformers, vector + }: + mkDerivation { + pname = "conduit-audio-lame"; + version = "0.1"; + sha256 = "0i4nmb4yf2wlkl5da215ysj25gyaikfd292nc9gzmnxjgg1fx19w"; + buildDepends = [ + base bytestring conduit conduit-audio resourcet transformers vector + ]; + extraLibraries = [ mp3lame ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the LAME MP3 library"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) { mp3lame = null;}; + + "conduit-audio-samplerate" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, resourcet + , samplerate, transformers, vector + }: + mkDerivation { + pname = "conduit-audio-samplerate"; + version = "0.1"; + sha256 = "04s5ld0nsgbjlgkj3f32xnwyah26m6j5qmjxycwgvxjp1siq2xsg"; + buildDepends = [ + base conduit conduit-audio resourcet transformers vector + ]; + extraLibraries = [ samplerate ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the libsamplerate resampling library"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) { samplerate = null;}; + + "conduit-audio-sndfile" = callPackage + ({ mkDerivation, base, conduit, conduit-audio, hsndfile + , hsndfile-vector, resourcet, transformers + }: + mkDerivation { + pname = "conduit-audio-sndfile"; + version = "0.1"; + sha256 = "0v0vzc23c9wfc594pc91d3dw2sda26z1lrkdjjvf572771xysdbd"; + buildDepends = [ + base conduit conduit-audio hsndfile hsndfile-vector resourcet + transformers + ]; + homepage = "http://github.com/mtolly/conduit-audio"; + description = "conduit-audio interface to the libsndfile audio file library"; + license = "LGPL"; + }) {}; + "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers @@ -32332,29 +32828,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "config-value" = callPackage + ({ mkDerivation, alex, array, base, bytestring, happy, pretty, text + , transformers + }: + mkDerivation { + pname = "config-value"; + version = "0.4"; + sha256 = "1p648vdlhqg587l9r4dr8v44mg1wshqbkg75qdy425cqs0jwkgyl"; + buildDepends = [ array base bytestring pretty text transformers ]; + buildTools = [ alex happy ]; + homepage = "https://github.com/glguy/config-value"; + description = "Simple, layout-based value language similar to YAML or JSON"; + license = stdenv.lib.licenses.mit; + }) {}; + "configifier" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , case-insensitive, containers, hspec, hspec-discover, mtl + , case-insensitive, containers, either, hspec, hspec-discover, mtl , pretty-show, QuickCheck, regex-easy, safe, scientific , string-conversions, text, unordered-containers, vector, yaml }: mkDerivation { pname = "configifier"; - version = "0.0.2"; - sha256 = "0k7gbkj9cz4rgicnllfh99i3d53qqwddysns0q3xwvvgv50ps8h3"; + version = "0.0.3"; + sha256 = "0l86i7rjbqrppfyfc3ypkal3q0rv8ldxp39hii076dwk7kgvjy1z"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring case-insensitive containers mtl pretty-show - regex-easy safe string-conversions text unordered-containers vector - yaml + aeson base bytestring case-insensitive containers either mtl + pretty-show regex-easy safe string-conversions text + unordered-containers vector yaml ]; testDepends = [ - aeson aeson-pretty base case-insensitive hspec hspec-discover + aeson aeson-pretty base case-insensitive hspec hspec-discover mtl pretty-show QuickCheck scientific string-conversions unordered-containers vector ]; - jailbreak = true; description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -32650,6 +33160,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "consul-haskell" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , http-client, HUnit, network, tasty, tasty-hunit, text + , transformers + }: + mkDerivation { + pname = "consul-haskell"; + version = "0.1"; + sha256 = "0i6xq7xd4bikb46mrcabiwwfga25wqcg7z45bh2hbqhf7yq8xjm6"; + buildDepends = [ + aeson base base64-bytestring bytestring http-client network text + transformers + ]; + testDepends = [ base http-client HUnit network tasty tasty-hunit ]; + homepage = "https://github.com/alphaHeavy/consul-haskell"; + description = "A consul client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "container-classes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -32666,6 +33196,7 @@ self: { mkDerivation { pname = "containers"; version = "0.4.2.1"; + revision = "2"; sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm"; editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8"; buildDepends = [ array base deepseq ]; @@ -32845,8 +33376,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.3"; - sha256 = "14g8s4wg7n730y1wi0p4cfd4d74zi4na2wnrdnarddhm02an2x5r"; + version = "1.3.1"; + sha256 = "18zmjn2d4ig0sfbbdajjzmqd9fjcyb6gjf4xywimdjg6wv053cxw"; buildDepends = [ base semigroups StateVar transformers transformers-compat void ]; @@ -32908,7 +33439,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Explicitly typed, checked exceptions with stack traces"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadsfd" = callPackage @@ -32925,7 +33455,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-fd instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadstf" = callPackage @@ -32942,7 +33471,6 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-tf instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-mtl" = callPackage @@ -33336,6 +33864,7 @@ self: { mkDerivation { pname = "copr"; version = "1.1.1"; + revision = "1"; sha256 = "0zgg60ri8yvz96gk08wdfn0445wqszigh2p0964nr2zdnffq5rnw"; editedCabalFile = "ef9fb8be7d257feae9e4647de62d489860e2bd6510e34a35465cf5b763fa2425"; buildDepends = [ @@ -33639,8 +34168,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.18.9"; - sha256 = "0bf9p5izkag6iqlpf59znsv8107hg1xghgas4crw2gxai1z7bfq6"; + version = "1.19"; + sha256 = "0fiyqyy7zzzbp0jsgl3syvm5db8n42h88ps7qzayxbsycjz9fp70"; isLibrary = true; isExecutable = true; buildDepends = [ base directory old-locale old-time polyparse ]; @@ -33672,6 +34201,7 @@ self: { mkDerivation { pname = "cprng-aes-effect"; version = "0.1.0.2"; + revision = "1"; sha256 = "0443h7jfpjvc6vmp3kfx0h6j2aynvgfznssz7lin9fmsxghlvsfb"; editedCabalFile = "b9752152bb1764da66976eaf18776b09dabf80eeb6f252bcee0da10fa0a1057e"; buildDepends = [ @@ -33762,8 +34292,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "3.0.1"; - sha256 = "02jgr0mm95hka82n2f3kg6ipyadz7gqgj2n4f7qxw27s5nszmz24"; + version = "3.0.2"; + sha256 = "0arp3nf6w7rqb1jxv2j20k4hps3zmdbz97qz500n7h5xx2s8p5c3"; buildDepends = [ base bytestring cereal Decimal iproute network template-haskell text time transformers uuid @@ -33785,19 +34315,17 @@ self: { }: mkDerivation { pname = "cql-io"; - version = "0.13.1"; - sha256 = "18vnwncpf18076bjqajrh6n0pkr9bmpcspf7v0s31df1lm6kxhcf"; + version = "0.13.2"; + sha256 = "155vz9ndwf6d7z94iq9kshbpxcqyf82lszg03x8qflmkn21i85kg"; buildDepends = [ async auto-update base bytestring containers cql data-default-class exceptions hashable iproute lens monad-control mtl mwc-random network semigroups stm text time tinylog transformers transformers-base uuid vector ]; - jailbreak = true; homepage = "https://github.com/twittner/cql-io/"; description = "Cassandra CQL client"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs" = callPackage @@ -33958,6 +34486,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) { crack = null;}; + "crackNum" = callPackage + ({ mkDerivation, base, data-binary-ieee754, ieee754 }: + mkDerivation { + pname = "crackNum"; + version = "1.0"; + sha256 = "1606f0pkl3rck72h8gap3k73k48pdlgkfzv96ij0dl910q332l1q"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base data-binary-ieee754 ieee754 ]; + description = "Crack various integer/floating-point data formats"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "craftwerk" = callPackage ({ mkDerivation, base, colour, mtl, vector-space }: mkDerivation { @@ -34153,23 +34694,23 @@ self: { "criterion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, containers, deepseq, directory, either, filepath, Glob - , hastache, HUnit, mtl, mwc-random, optparse-applicative, parsec - , QuickCheck, statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , vector-algorithms + , cassava, containers, deepseq, directory, filepath, Glob, hastache + , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck + , statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-compat, vector, vector-algorithms }: mkDerivation { pname = "criterion"; - version = "1.0.2.0"; - sha256 = "02mcb49hiv0gijj5343gffdd3r8hjf4d52llv2gradaijz4zdqhx"; + version = "1.1.0.0"; + sha256 = "0f1d8lxb9jhrhcm0gbqqimmq52q36b5h1nqznmjmxa75nqdx9vaw"; isLibrary = true; isExecutable = true; buildDepends = [ aeson ansi-wl-pprint base binary bytestring cassava containers - deepseq directory either filepath Glob hastache mtl mwc-random + deepseq directory filepath Glob hastache mtl mwc-random optparse-applicative parsec statistics text time transformers - vector vector-algorithms + transformers-compat vector vector-algorithms ]; testDepends = [ base bytestring HUnit QuickCheck statistics test-framework @@ -34431,6 +34972,7 @@ self: { mkDerivation { pname = "crypto-numbers"; version = "0.2.7"; + revision = "1"; sha256 = "19l9y5jzvqrqfam13xin9m9ca0s5ql86yv0cjn6dzkydx4byn2j2"; editedCabalFile = "2b493386b7605b70a67f751d6496e9feff8ef319a5294b122a3ff3895a8453ca"; buildDepends = [ @@ -34535,6 +35077,7 @@ self: { mkDerivation { pname = "crypto-random-effect"; version = "0.2.0.4.1"; + revision = "1"; sha256 = "1gj40r6i79jvsghyv4nqm3yrjlby9fkxxhzp0lkr5j1b9b3b2xwr"; editedCabalFile = "f217573816b1efe3fcc9b1dcbd6325015bc9a87872200547f56a80ec2b959c31"; buildDepends = [ @@ -34629,6 +35172,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptol" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, async, base + , containers, deepseq, directory, filepath, gitrev, GraphSCC, happy + , haskeline, heredoc, monadLib, old-time, presburger, pretty + , process, QuickCheck, random, sbv, smtLib, syb, template-haskell + , text, tf-random, transformers, utf8-string + }: + mkDerivation { + pname = "cryptol"; + version = "2.2.1"; + sha256 = "06dl3jkv0ygyb42p89hifrsmcg8jipyag01ibwj3gr6kxm443cg7"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + ansi-terminal array async base containers deepseq directory + filepath gitrev GraphSCC haskeline heredoc monadLib old-time + presburger pretty process QuickCheck random sbv smtLib syb + template-haskell text tf-random transformers utf8-string + ]; + buildTools = [ alex happy ]; + homepage = "http://www.cryptol.net/"; + description = "Cryptol: The Language of Cryptography"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptsy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, either , http-client, http-client-tls, old-locale, pipes-attoparsec @@ -34693,8 +35261,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "4.3"; - sha256 = "11qy08pc1h83yj6qaw529bxrynzs8453ddih6qn2cqs9m35hy9vs"; + version = "4.4"; + sha256 = "10xv10qndgcj43vyc94pb482773advv6pd2sklh1pwnzyp6wsvpb"; buildDepends = [ base Boolean colour csound-expression-opcodes csound-expression-typed data-default process @@ -34710,8 +35278,8 @@ self: { }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.1.0"; - sha256 = "0vbvah8icjnc2bjp8w21x8a48ijy598q09wgx68al4d4nya7fj4v"; + version = "0.1.1"; + sha256 = "1jb4x6arpfskxwlhc5l1kggmzcsp0c7ygvywbzm7bqswmp5sdhvy"; buildDepends = [ array base Boolean containers data-default data-fix data-fix-cse transformers wl-pprint @@ -34743,8 +35311,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.0.6.1"; - sha256 = "1wqzh0gvb53410ingfvvja0yw4wbzn21sypmi0b13nssacbv1y7q"; + version = "0.0.7.0"; + sha256 = "1kd4fhlgkcc8d50rmkar1waniaqm5ip0g3nw47qkh7a668yfmfa4"; buildDepends = [ base Boolean colour containers csound-expression-dynamic data-default deepseq ghc-prim stable-maps transformers wl-pprint @@ -34758,8 +35326,8 @@ self: { ({ mkDerivation, base, csound-expression, transformers }: mkDerivation { pname = "csound-sampler"; - version = "0.0.3.2"; - sha256 = "02gzrsqh0pvjdc5q33jm0psxr1yf7n81q73x200r2k416g0a5p7s"; + version = "0.0.4.0"; + sha256 = "03mymb5yk4hlf6nsmakxw0nyspvrs7882dmpx9r65lkpsvgnaxyp"; buildDepends = [ base csound-expression transformers ]; homepage = "https://github.com/anton-k/csound-sampler"; description = "A musical sampler based on Csound"; @@ -34829,22 +35397,22 @@ self: { }) {}; "csv-conduit" = callPackage - ({ mkDerivation, array, attoparsec, attoparsec-conduit, base - , blaze-builder, bytestring, conduit, conduit-extra, containers - , data-default, directory, ghc-prim, HUnit, mmorph, monad-control - , mtl, primitive, resourcet, test-framework, test-framework-hunit - , text, transformers, unordered-containers, vector + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , ghc-prim, HUnit, mmorph, monad-control, mtl, primitive, resourcet + , test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "csv-conduit"; - version = "0.6.3"; - sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4"; + version = "0.6.6"; + sha256 = "12sxxv92qblsa63zdnl80a8yk01b4cvk9k6h58w82bvcy5m0aabk"; isLibrary = true; isExecutable = true; buildDepends = [ - array attoparsec attoparsec-conduit base blaze-builder bytestring - conduit conduit-extra containers data-default directory ghc-prim - mmorph monad-control mtl primitive resourcet text transformers + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default directory ghc-prim mmorph + monad-control mtl primitive resourcet text transformers unordered-containers vector ]; testDepends = [ @@ -35000,8 +35568,8 @@ self: { ({ mkDerivation, base, hmatrix, safe }: mkDerivation { pname = "cubicspline"; - version = "0.1"; - sha256 = "0z6gwg8h760jviq2v8m9b5w84f9qrkz3hd1vp5y183i0c2wa97ak"; + version = "0.1.1"; + sha256 = "0n4c80vjf8sh5wf1n0qp9z8v8z7mj7rfygjg5a02sz0s6l7q1i8s"; buildDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; license = stdenv.lib.licenses.bsd3; @@ -35023,7 +35591,6 @@ self: { homepage = "https://github.com/bmsherman/cublas"; description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { cublas = null; cusparse = null;}; "cuboid" = callPackage @@ -35052,7 +35619,6 @@ self: { homepage = "https://github.com/tmcdonell/cuda"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cudd" = callPackage @@ -35084,7 +35650,6 @@ self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curl" = callPackage @@ -35116,6 +35681,7 @@ self: { mkDerivation { pname = "curlhs"; version = "0.1.3"; + revision = "10"; sha256 = "0m8n19kyimxd9c7aazkw7gak7v1lik04m0y0izs3zanjlhqvnn3j"; editedCabalFile = "1ae61743cd2150bfb25b279dbf7e4b9d0c9a2339e04cdb7fcf5a0358d7b712e0"; buildDepends = [ base bytestring rtld time ]; @@ -35193,8 +35759,8 @@ self: { }: mkDerivation { pname = "cursedcsv"; - version = "0.1.1"; - sha256 = "1qcld5mg8vla6fb9biriyx3lldn69spq9halg46in6lg5qw45ycz"; + version = "0.1.2"; + sha256 = "045lfyhpwjgcdw3wxj2klq0aqn555f5r4w95fr06vsq5pxspnnvc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -36204,8 +36770,8 @@ self: { ({ mkDerivation, base, containers, data-fix, transformers }: mkDerivation { pname = "data-fix-cse"; - version = "0.0.1"; - sha256 = "1jrkphyw1npj4f2vy7n6xap1v2h6glw0gwzjg0iyjnflhjgnfl2m"; + version = "0.0.2"; + sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; buildDepends = [ base containers data-fix transformers ]; homepage = "https://github.com/anton-k/data-fix-cse"; description = "Common subexpression elimination for the fixploint types"; @@ -36589,6 +37155,7 @@ self: { mkDerivation { pname = "data-reify"; version = "0.6"; + revision = "1"; sha256 = "0mif89mpj5zvw8czc51mfj27jw2ipxd2awnm9q13s46k6s5pv6a7"; editedCabalFile = "60185d3fdb87fe62f297eb4473d58a7ccf93d1b6ee790a8b2faed79e1ac833c1"; isLibrary = true; @@ -37019,8 +37586,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "0.10.9.2"; - sha256 = "0xz1iajg8rmv1n21b0iifp3c6gywm75m4x4bir991m9j7v88ij6l"; + version = "0.10.10"; + sha256 = "0s14yb2bbi5n9m3xkznm4nbb0hpj9hmiwl0ppqqiml5s7xhwas6d"; buildDepends = [ base bytestring cereal containers libxml-sax network parsec random text transformers unix vector xml-types @@ -37438,17 +38005,16 @@ self: { }) {}; "debian" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, bzlib - , containers, directory, either, exceptions, filepath, HaXml, HUnit - , ListLike, mtl, network, network-uri, old-locale, parsec, pretty - , prettyclass, process, process-extras, pureMD5, regex-compat - , regex-tdfa, template-haskell, text, time, unix, Unixutils - , utf8-string, zlib + ({ mkDerivation, base, bytestring, bzlib, containers, directory + , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl + , network, network-uri, old-locale, parsec, pretty, prettyclass + , process, process-extras, pureMD5, regex-compat, regex-tdfa + , template-haskell, text, time, unix, Unixutils, utf8-string, zlib }: mkDerivation { pname = "debian"; - version = "3.87.1"; - sha256 = "1g8l293gk06qjyfng70nzwzir7w27fajbkc1ck6b9w96rpcr3ipf"; + version = "3.87.2"; + sha256 = "135f0szbnn8xp5zzfmlqcpmsrswahgc4rlgviyznfx6c4j7hg519"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -37459,7 +38025,7 @@ self: { utf8-string zlib ]; testDepends = [ - ansi-wl-pprint base HUnit parsec pretty prettyclass regex-tdfa text + base HUnit parsec pretty prettyclass regex-tdfa text ]; homepage = "https://github.com/ddssff/debian-haskell"; description = "Modules for working with the Debian package system"; @@ -37592,15 +38158,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "deepseq_1_4_1_0" = callPackage - ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework + "deepseq_1_4_1_1" = callPackage + ({ mkDerivation, array, base, HUnit, test-framework , test-framework-hunit }: mkDerivation { pname = "deepseq"; - version = "1.4.1.0"; - sha256 = "1azyq3vralgqi3sl61xhx0r7q7bwjfjhgk8jrjmziq55ymfkssna"; - buildDepends = [ array base ghc-prim ]; + version = "1.4.1.1"; + sha256 = "1gxk6bdqfplvq0lma2sjcxl8ibix5k60g71dncpvwsmc63mmi0ch"; + buildDepends = [ array base ]; testDepends = [ array base HUnit test-framework test-framework-hunit ]; @@ -37638,7 +38204,9 @@ self: { mkDerivation { pname = "deepseq-generics"; version = "0.1.1.2"; + revision = "1"; sha256 = "01pvigx8n9p8hwbzp2qiq6kzf7cxiam843jz2sjgliacmmp1v7l3"; + editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; buildDepends = [ base deepseq ghc-prim ]; testDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -37725,6 +38293,7 @@ self: { mkDerivation { pname = "definitive-filesystem"; version = "1.2"; + revision = "1"; sha256 = "0bc098igiqzbm25bjaxdxm4jq17kc8bgz1ab0pgm0h5jvy1bf8id"; editedCabalFile = "3a78d4d8aaa291ca95d889b62a979c4132bbe6f91073ab2bd9fdb0d55ed63121"; buildDepends = [ @@ -37748,6 +38317,7 @@ self: { mkDerivation { pname = "definitive-graphics"; version = "1.2"; + revision = "1"; sha256 = "0ah19j2al9l6pbin821rsicidmg3rd4cc74r8qw095773sa98zyr"; editedCabalFile = "a6d867ea8098390daff40c088c81f854ca054f9a0c8b097f9194be329416baed"; buildDepends = [ @@ -37789,6 +38359,7 @@ self: { mkDerivation { pname = "definitive-reactive"; version = "1.0"; + revision = "1"; sha256 = "0gk39602k5yjxxgpd725dnvqhlcnaqgds7g0c8v1h509lc0d7xm3"; editedCabalFile = "8c3c6afcc4ce7569ede32c8006d1d66fb10448321159f875d1dec03419bd7797"; buildDepends = [ @@ -37810,6 +38381,7 @@ self: { mkDerivation { pname = "definitive-sound"; version = "1.0"; + revision = "1"; sha256 = "01k4h7av4fhp4xchrcbnc1gnnbsh5ngasq55l16n3l438pr73vzj"; editedCabalFile = "1491f0a01f47b84ea8f01a94492738a7f3b5fe7c68c805cca8701926cc443d71"; buildDepends = [ @@ -38566,6 +39138,7 @@ self: { mkDerivation { pname = "diagrams-hsqml"; version = "0.0.0.2"; + revision = "1"; sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng"; editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490"; buildDepends = [ @@ -38696,7 +39269,9 @@ self: { mkDerivation { pname = "diagrams-svg"; version = "1.1.0.4"; + revision = "1"; sha256 = "11adbfvj5a8yzlbkqs433qgr7884n1vlff9vr6h9w1n0nc1amzpl"; + editedCabalFile = "2fd35c0f8bb7ba4d17e04ae258addf4a949b91c2b404c0bbac76dbc6dc819c31"; buildDepends = [ base base64-bytestring blaze-markup blaze-svg bytestring colour containers diagrams-core diagrams-lib directory filepath hashable @@ -38913,7 +39488,6 @@ self: { base blaze-bootstrap blaze-html digestive-functors digestive-functors-blaze http-types text ]; - jailbreak = true; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; }) {}; @@ -38941,8 +39515,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.7.1.4"; - sha256 = "0h2ki8vzfmvzazvzcmngb6ahki3k2zh9pbgn4hj8jaicfxrdv9xb"; + version = "0.7.1.5"; + sha256 = "1rfdxac3cnwa5r5zxic3xhj4n59f7s6l34xmja4q87ylqxfyqmls"; buildDepends = [ base bytestring containers mtl old-locale text time ]; @@ -39508,6 +40082,7 @@ self: { mkDerivation { pname = "disk-free-space"; version = "0.1.0.1"; + revision = "2"; sha256 = "07rqj8k1vh3cykq9yidpjxhgh1f7vgmjs6y1nv5kq2217ff4yypi"; editedCabalFile = "60ab6de6ad0e36274c675338a37c8985972a5a64db69dee7b4f88b797c9b401b"; buildDepends = [ base ]; @@ -39727,8 +40302,8 @@ self: { }: mkDerivation { pname = "distributed-process-p2p"; - version = "0.1.3.1"; - sha256 = "00dbw4p60lbfjfhi9xzyh1jjdndygw00xpirzcnl5f20370hdikh"; + version = "0.1.3.2"; + sha256 = "13m283cwlas0xzqxlrmnwmwimwy29hbvymavyqffd1b0k2m6ag31"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -39946,6 +40521,7 @@ self: { homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-static" = callPackage @@ -40115,8 +40691,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "1.4.4"; - sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd"; + version = "1.4.5"; + sha256 = "13s9ysa5hkjjc2a5290mbpnrk2mjg3w01mib62p65rywz26yc7g5"; buildDepends = [ attoparsec base binary blaze-builder bytestring conduit conduit-extra containers iproute mtl network random resourcet @@ -40360,6 +40936,7 @@ self: { mkDerivation { pname = "doctest-discover-configurator"; version = "0.1.0.6"; + revision = "1"; sha256 = "1n2x8rp67ddifyahxcny0k7r514qa82lbxg13z7yg2kvmrfip7r8"; editedCabalFile = "79f62a00ff10acba4f850730ed2ffe99d5637bdfdb48f6fc4b92f03fbbb20a45"; isLibrary = true; @@ -40494,8 +41071,8 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.1.0.5"; - sha256 = "1gh1x4dzcrivlb8gnqgb96v6yvi78c1rx52wplbfy3z5pzg9mx1f"; + version = "0.1.0.7"; + sha256 = "0wxzlgh3qz35x3vw5m1xk3f9hq5kpyhccy9h05s0q5012fcd189a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -40537,11 +41114,12 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "dotgen"; - version = "0.4.1"; - sha256 = "1g5ds0mqkz0lzhcp42hin08azschs3p083ikdk4d5jil8rzl7d8k"; + version = "0.4.2"; + sha256 = "148q93qsmqgr5pzdwvpjqfd6bdm1pwzcp2rblfwswx2x8c5f43fg"; isLibrary = true; isExecutable = true; buildDepends = [ base containers ]; + homepage = "https://github.com/ku-fpg/dotgen"; description = "A simple interface for building .dot graph files."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -41005,6 +41583,7 @@ self: { mkDerivation { pname = "dtab"; version = "1.0"; + revision = "1"; sha256 = "1zx5kpljjxyzbsg0hg8ml8mig1s9hggm2nlqmbfbxmldxh3pq1j3"; editedCabalFile = "2a7a20cc1b621e5a04b3ca28b3d03d11792731256fb39e94882e5e735d52ac15"; isLibrary = true; @@ -41274,8 +41853,8 @@ self: { }: mkDerivation { pname = "dynamic-cabal"; - version = "0.3.4"; - sha256 = "080hynvyrc5jbfm4v5l04iby70rf6fqa3ynbpj1njdh6xjc4wnlv"; + version = "0.3.5"; + sha256 = "0fkr3hps3v0ygcah4dpzfqyfxm0rj4knivbbarllzv86h042vwxw"; buildDepends = [ base containers data-default directory filepath ghc ghc-paths haskell-generate haskell-src-exts time void @@ -41376,6 +41955,7 @@ self: { mkDerivation { pname = "dynamic-plot"; version = "0.1.0.1"; + revision = "1"; sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31"; editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5"; buildDepends = [ @@ -41678,10 +42258,8 @@ self: { }: mkDerivation { pname = "ede"; - version = "0.2.4"; - sha256 = "0aji7bnkql6k0b6qa9m7g7y6nvkz8hxwf8w5bk6yzxnzvfg3dxdb"; - isLibrary = true; - isExecutable = true; + version = "0.2.8"; + sha256 = "1pzqjs7560xkw51aqpivm6sgysnxs6c5jy4fnalvds79gk37yryh"; buildDepends = [ aeson ansi-wl-pprint base bifunctors bytestring comonad directory filepath free lens mtl parsers scientific semigroups text @@ -41690,11 +42268,9 @@ self: { testDepends = [ aeson base bifunctors bytestring directory tasty tasty-golden text ]; - jailbreak = true; homepage = "http://github.com/brendanhay/ede"; description = "Templating language with similar syntax and features to Liquid or Jinja2"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "edenmodules" = callPackage @@ -41834,8 +42410,8 @@ self: { }: mkDerivation { pname = "effect-handlers"; - version = "0.1.0.4"; - sha256 = "1qsr8xsv3hhk3m97zlzmpspjx9b4aghg0axyriwfy5mkbl3kqy93"; + version = "0.1.0.6"; + sha256 = "0i7glghwh35pfyzznzabaf8fnadk00lpajmasw5h5ndjl2dmqzy9"; buildDepends = [ base free kan-extensions mtl ]; testDepends = [ base hspec hspec-discover HUnit QuickCheck ]; homepage = "https://github.com/edofic/effect-handlers"; @@ -42020,6 +42596,7 @@ self: { mkDerivation { pname = "ehs"; version = "0.7.0"; + revision = "3"; sha256 = "0kckic7v6gab6ksbdmnxbv41fm68zvhfcmvshln9hxmq2mgli11x"; editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222"; isLibrary = true; @@ -42041,6 +42618,7 @@ self: { mkDerivation { pname = "eibd-client-simple"; version = "0.0.4"; + revision = "1"; sha256 = "14nxahznqy6xfjgyi8d11b4hgrw431ywqc5hkz0lbpgxysgkc61d"; editedCabalFile = "5154a0f9083521b4c60cee92f2614b253961fd1e2dd9e7c5b541630df8597d80"; buildDepends = [ base bytestring containers mtl transformers ]; @@ -42052,12 +42630,12 @@ self: { }) { eibclient = null;}; "eigen" = callPackage - ({ mkDerivation, base, primitive, vector }: + ({ mkDerivation, base, bytestring, primitive, vector }: mkDerivation { pname = "eigen"; - version = "2.0.1"; - sha256 = "1700jnqb5d4xbn6cxpbqnhdavwsgkha8pciv01f5f37ckiyj0wh3"; - buildDepends = [ base primitive vector ]; + version = "2.1.0"; + sha256 = "14amg4g7gxsi529hz5ilhv8b8nzs8p2ypmxh21hq5x4sfnsl4n07"; + buildDepends = [ base bytestring primitive vector ]; testDepends = [ base primitive vector ]; homepage = "https://github.com/osidorkin/haskell-eigen"; description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)"; @@ -42283,8 +42861,8 @@ self: { ({ mkDerivation, base, extensible, transformers }: mkDerivation { pname = "elevator"; - version = "0.2.2"; - sha256 = "1rnxvhyxgjb9ma680d713i0cqbsq0y8s1d57z2zx5qyq10jshcnm"; + version = "0.2.3"; + sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2"; buildDepends = [ base extensible transformers ]; homepage = "https://github.com/fumieval/elevator"; description = "Immediately lifts to a desired level"; @@ -42709,8 +43287,8 @@ self: { }: mkDerivation { pname = "enclosed-exceptions"; - version = "1.0.1"; - sha256 = "1kid1hi392h88a1am0jkm7dhwl3v78lw5wfcyhmh0x454yr3b6zz"; + version = "1.0.1.1"; + sha256 = "16ax1kqdsk4apg642qxkm2hf9vb5hzmkd14zmkxra8ssp8rn28z5"; buildDepends = [ async base deepseq lifted-base monad-control transformers transformers-base @@ -42798,6 +43376,7 @@ self: { mkDerivation { pname = "engine-io-yesod"; version = "1.0.1"; + revision = "1"; sha256 = "0pczmiqrg046r367j071h2hr6p2amw93sqy7j1drd2gdiwaxzn02"; editedCabalFile = "5963c385f145309049f67eb35f835abf2530a7b117730bd9fe0c4991837a52aa"; buildDepends = [ @@ -43037,8 +43616,8 @@ self: { }: mkDerivation { pname = "epic"; - version = "0.9.3.2"; - sha256 = "1l73absns4ci20brkdjg1r1l9p4xxx88vax736diqik7rl7zrx9h"; + version = "0.9.3.3"; + sha256 = "0ap8jr11sk8v2sdi03pahjhaxx3mc4ba7qbh3m8nsg0g5wr4962m"; isLibrary = true; isExecutable = true; buildDepends = [ array base Cabal directory mtl process ]; @@ -43383,12 +43962,12 @@ self: { }) {}; "errorcall-eq-instance" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, base-compat, hspec, QuickCheck }: mkDerivation { pname = "errorcall-eq-instance"; - version = "0.1.0"; - sha256 = "1sr2wxbdqzpdawcivvd01nwpki0xbcxylz5qv95b96sq6b296gkk"; - buildDepends = [ base ]; + version = "0.2.0"; + sha256 = "1hq3f4m7hp6czyv5c9h3iwd99510vf88890kcd3kkw11id7sbj6n"; + buildDepends = [ base base-compat ]; testDepends = [ base hspec QuickCheck ]; description = "An orphan Eq instance for ErrorCall"; license = stdenv.lib.licenses.mit; @@ -43494,8 +44073,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "2.1.2.1"; - sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i"; + version = "2.1.2.2"; + sha256 = "1sklvl3fl7sq64i5k5jrhc6xvfa4a1a6dfbnzl2alq65x73jzna6"; buildDepends = [ base conduit monad-logger persistent resourcet tagged text transformers unordered-containers @@ -43684,8 +44263,8 @@ self: { }: mkDerivation { pname = "euler"; - version = "0.8.0"; - sha256 = "1sg82434pmy9nwi2c5i7az6jllhfjipal6l4d6ijimvavq4gim0p"; + version = "0.8.2"; + sha256 = "1dw4jsvyv4a736q2q0790qc7b5b4vaw2pwpn0ibdn33h6463a4pf"; buildDepends = [ base ]; testDepends = [ base directory happy hlint hspec process regex-posix xml @@ -43945,16 +44524,17 @@ self: { "executable-hash" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory - , executable-path, file-embed + , executable-path, file-embed, template-haskell }: mkDerivation { pname = "executable-hash"; - version = "0.1.1.1"; - sha256 = "1k01qsd2cfrhmxxs8l84g6xc0wcr2hb4s50k3yiin6r8wzli915r"; + version = "0.2.0.0"; + sha256 = "0g733akm65rjdl5mncfyhnqncan985n02vzn0z02689aq8dnav4p"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring cryptohash directory executable-path file-embed + template-haskell ]; testDepends = [ base ]; homepage = "http://github.com/fpco/executable-hash"; @@ -44065,6 +44645,7 @@ self: { mkDerivation { pname = "expiring-cache-map"; version = "0.0.5.3"; + revision = "1"; sha256 = "0ihyfhkqdr29pmcb2pylrj6p2xmfgfz9qw6dabxxy8dbcg38ppvf"; editedCabalFile = "e3990400b7a0fc202dd68fb9d4fea926af9fdaeb34d2e9cf7e04eb3c2a03da4c"; buildDepends = [ base containers hashable unordered-containers ]; @@ -44205,6 +44786,7 @@ self: { mkDerivation { pname = "exposed-containers"; version = "0.5.5.1"; + revision = "1"; sha256 = "09ck4hadxgdlqpgxr45jxr261mzkzihmwd5b02xi05z8034bhqk7"; editedCabalFile = "25516f8a7288ce438b872a0d3054434c3ba48ce0ce8a57209ea6d78ce6e2665c"; buildDepends = [ array base deepseq ghc-prim ]; @@ -44305,8 +44887,8 @@ self: { ({ mkDerivation, base, binary, constraints, template-haskell }: mkDerivation { pname = "extensible"; - version = "0.3.1"; - sha256 = "09vz1z2v2jgn0lrnb8pkgr3r5xbcqmpww671q75nyi74f308zn2n"; + version = "0.3.2"; + sha256 = "1fb027d14100s384mhl0g09jpjxqam85g6yh0pnwcn3g4fzq0fln"; buildDepends = [ base binary constraints template-haskell ]; homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, lens-friendly data types"; @@ -44619,8 +45201,8 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.3.0"; - sha256 = "1ii4wkpsi5w2230bzhnzcpgckd5gkawckws2vyggw78b91dw9dc5"; + version = "2.3.1"; + sha256 = "02smmj62jir0c4ix929xy7zsd03djp53hxps0wgqga1f123gksri"; buildDepends = [ array auto-update base bytestring bytestring-builder directory filepath text @@ -44709,6 +45291,7 @@ self: { mkDerivation { pname = "fastcgi"; version = "3001.0.2.4"; + revision = "1"; sha256 = "0lp17w098043xczwkah7h1x47wzrym7vv5adgla0aq9iybqay7xr"; editedCabalFile = "74cd87692a90492171802f25c034ef047f0b68aaa1b53303d4e50ce3ec30e98a"; buildDepends = [ base bytestring cgi ]; @@ -44770,31 +45353,29 @@ self: { "fay" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , directory, filepath, ghc-paths, haskell-names, haskell-packages - , haskell-src-exts, language-ecmascript, mtl, mtl-compat - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat, uniplate - , unordered-containers, utf8-string, vector + , data-lens-light, directory, filepath, ghc-paths, haskell-src-exts + , language-ecmascript, mtl, mtl-compat, optparse-applicative + , process, safe, sourcemap, split, spoon, syb, text, time + , transformers, transformers-compat, traverse-with-class, type-eq + , uniplate, unordered-containers, utf8-string, vector }: mkDerivation { pname = "fay"; - version = "0.23.1.1"; - sha256 = "1g16j84yp348n12mgyry6qz3m5b1iz7hiv3ri3kp95577w9baxqp"; + version = "0.23.1.4"; + sha256 = "1l8r7d4iwwkq0m9cskwfv38i89cr8sqxidrc59z62yp05ilcs5r6"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring containers data-default directory filepath - ghc-paths haskell-names haskell-packages haskell-src-exts - language-ecmascript mtl mtl-compat optparse-applicative process - safe sourcemap split spoon syb text time transformers - transformers-compat uniplate unordered-containers utf8-string - vector + aeson base bytestring containers data-default data-lens-light + directory filepath ghc-paths haskell-src-exts language-ecmascript + mtl mtl-compat optparse-applicative process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector ]; - jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -44807,7 +45388,6 @@ self: { homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-builder" = callPackage @@ -44816,14 +45396,13 @@ self: { }: mkDerivation { pname = "fay-builder"; - version = "0.2.0.3"; - sha256 = "1kkx6abrvbd2cdwpgdx7cpwyfqpk31zwrxfw9kr1ngayf7sgzc9s"; + version = "0.2.0.4"; + sha256 = "0x1y9d2hgi3ky7f7ydc43dyd54dsmqcgxj6g8n2x3yfrcjkljq05"; buildDepends = [ base Cabal data-default directory fay filepath safe split text ]; description = "Compile Fay code on cabal install, and ad-hoc recompile during development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-dom" = callPackage @@ -44836,7 +45415,6 @@ self: { homepage = "https://github.com/faylang/fay-dom"; description = "DOM FFI wrapper library for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-hsx" = callPackage @@ -44863,7 +45441,6 @@ self: { homepage = "https://github.com/faylang/fay-jquery"; description = "jQuery bindings for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-ref" = callPackage @@ -44876,7 +45453,6 @@ self: { homepage = "https://github.com/A1kmm/fay-ref"; description = "Like IORef but for Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-text" = callPackage @@ -44889,7 +45465,6 @@ self: { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-uri" = callPackage @@ -44902,7 +45477,6 @@ self: { homepage = "https://github.com/faylang/fay-uri"; description = "Persistent FFI bindings for using jsUri in Fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fb" = callPackage @@ -45086,6 +45660,7 @@ self: { mkDerivation { pname = "fedora-packages"; version = "0.0.3"; + revision = "1"; sha256 = "14fpv76ndp755mysgbya2hgr35rg2hb6dsagmrq2j2mn06xmngqk"; editedCabalFile = "b09d857e6d91527f8c9fbb8626e1610c5c7b994a6fcf30cd3328c668a6e8d33a"; buildDepends = [ @@ -45108,6 +45683,7 @@ self: { mkDerivation { pname = "feed"; version = "0.3.9.2"; + revision = "1"; sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg"; editedCabalFile = "62cb5a05a61bc09e6203b5bb7aab4464cba1703216260b0d871d98046c226358"; buildDepends = [ base old-locale old-time time utf8-string xml ]; @@ -45141,8 +45717,8 @@ self: { }: mkDerivation { pname = "feed-crawl"; - version = "0.1.1.0"; - sha256 = "0137b0bi24cdmwbvpz9cr3iavcyz95xvq48ydqdilazr6gl81m13"; + version = "0.1.2.0"; + sha256 = "0d3yfkiazzlypp3s85fqikwlli28ss27h0i215114vxsswmx1g7c"; buildDepends = [ base bytestring conduit connection http-conduit http-types hxt network-uri text transformers @@ -45288,8 +45864,8 @@ self: { ({ mkDerivation, base, containers, regex-compat }: mkDerivation { pname = "fez-conf"; - version = "1.0.1"; - sha256 = "180vflhr18kj5vgsy715wrrb0cx9l89xw2g6y2ga4gg6hc71khzl"; + version = "1.0.3"; + sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b"; buildDepends = [ base containers regex-compat ]; homepage = "http://ui3.info/d/proj/fez-conf.html"; description = "Simple functions for loading config files"; @@ -45575,15 +46151,16 @@ self: { }) {}; "filecache" = callPackage - ({ mkDerivation, base, directory, hashable, hinotify, lens, mtl - , stm, strict-base-types, temporary, unordered-containers + ({ mkDerivation, base, directory, exceptions, hashable, hinotify + , lens, mtl, stm, strict-base-types, temporary + , unordered-containers }: mkDerivation { pname = "filecache"; - version = "0.2.5"; - sha256 = "0yx255yl8v8knhbnzahx2v606y23nmgh5hs65dqcxmhyh53wawda"; + version = "0.2.8"; + sha256 = "0dkdjj29dqgdywzxc24l54v8xqxrqy65l43ig2qr3l381mqi87lf"; buildDepends = [ - base hashable hinotify lens mtl stm strict-base-types + base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers ]; testDepends = [ base directory temporary unordered-containers ]; @@ -45737,6 +46314,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "filtrable"; + version = "0.1.0.2"; + sha256 = "0dfw08pqw4wlja1iavb8zz0rkr97hd7fg1v2akng8n7shmjhgbl5"; + buildDepends = [ base ]; + homepage = "https://github.com/strake/filtrable.hs"; + description = "Class of filtrable containers"; + license = "unknown"; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -45781,8 +46370,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.0.1"; - sha256 = "02448wi1z0zxiin749w00z55pjm8d1wkhx53rmmfwq2vjzr8akvx"; + version = "0.1.0.2"; + sha256 = "1krsymv66lnz30hv3j2427vl1wh7vczjb66qviq8mfxgfxf2q8z6"; buildDepends = [ base ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -45893,6 +46482,7 @@ self: { mkDerivation { pname = "fit"; version = "0.5"; + revision = "1"; sha256 = "0xazsm6zdvnjxhy31c5zpjbd3fc98pcy545fq3jxvzh6c913fdjl"; editedCabalFile = "87f70d521590ba57a662694c83401df69c45c6c721e52119fde62685873b5f6f"; buildDepends = [ @@ -46331,6 +46921,7 @@ self: { mkDerivation { pname = "flippers"; version = "1.0.1"; + revision = "1"; sha256 = "1swyj1f67giq7h9xcl6dzsw4ywk1jbl6avpihbv0q9g9hp6yzqp3"; editedCabalFile = "e908ada5c891a6ac39cefb7e41648606d1a5f1b1048281f93bd496c5f22d73b4"; buildDepends = [ base ]; @@ -46637,8 +47228,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "focus"; - version = "0.1.3"; - sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy"; + version = "0.1.4"; + sha256 = "0h6q48ybcch1p15f4x56ya4d8mn4dwzbfjx573dy6z3x12v7qi2n"; buildDepends = [ base ]; homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; @@ -46651,8 +47242,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.8"; - sha256 = "1v8g1n17lwjwr2d1r3zam44qlm3jrr5j30d4cs4n4gf5pgxlrzvp"; + version = "1.0.9"; + sha256 = "10y9r4h6a6na0gpf5sy5mm34k94swisv6wbj2k210zyfvnrx9r36"; buildDepends = [ base bytestring containers primitive text transformers vector ]; @@ -46840,6 +47431,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forecast-io" = callPackage + ({ mkDerivation, aeson, base, text }: + mkDerivation { + pname = "forecast-io"; + version = "0.1.0.0"; + sha256 = "0z2hv8lv75zij9arvxdircc0db0r0m86fgk5496hh1gvxxd5pqw6"; + buildDepends = [ aeson base text ]; + homepage = "https://github.com/stormont/forecast-io"; + description = "A Haskell library for working with forecast.io data."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foreign-storable-asymmetric" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48103,6 +48706,7 @@ self: { mkDerivation { pname = "future-resource"; version = "0.3.0.0"; + revision = "1"; sha256 = "1w1ifjzfpqlqf7dzlnca67xhc1m1ddaflq3xin5xf9s2qnmsahvx"; editedCabalFile = "f9842af26e96134d6190b8ee4f8588c0352f192443330012e66105ac4e18b082"; buildDepends = [ base ]; @@ -48184,6 +48788,7 @@ self: { mkDerivation { pname = "fwgl-glfw"; version = "0.1.0.3"; + revision = "1"; sha256 = "1zmvw7945lkghavik72w096rqh8ivjyb9h6j98yjvlj6xf85bsq0"; editedCabalFile = "f2a35fcd71bbea225624cf3b6d1f78647e103a1ee1edcc0a7eb9e27b0c4642d8"; buildDepends = [ @@ -48620,6 +49225,7 @@ self: { mkDerivation { pname = "generic-aeson"; version = "0.2.0.2"; + revision = "1"; sha256 = "1x58c7xgdc1asg4n61fpikn7jvspyqawykq4q49xhsp5dp11lzzh"; editedCabalFile = "51683167451b51086821ec0cb41902f0471a2444aa81a5cf66cc68838f47f99d"; buildDepends = [ @@ -48787,8 +49393,8 @@ self: { ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.1.1.1"; - sha256 = "1g532p1k8df7vfwfh4zwj4s020k4c9ncvc68xy0hniijy61ncc5n"; + version = "0.1.1.2"; + sha256 = "1r9icxwyh4pg952yaywk4nfj4j21klzf361z9z24avd6vw89p6v7"; buildDepends = [ base ghc-prim template-haskell ]; description = "Generic Programming using True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -49066,6 +49672,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "getopt-generics" = callPackage + ({ mkDerivation, base, generics-sop, hspec, safe, silently }: + mkDerivation { + pname = "getopt-generics"; + version = "0.1.1"; + sha256 = "1cf1mhc7wf8s0sbnq0a3xn8v5w1aw2py78flzanj9slz7cr02gqb"; + buildDepends = [ base generics-sop safe ]; + testDepends = [ base generics-sop hspec silently ]; + description = "Simple command line argument parsing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "getopt-simple" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -49087,6 +49705,7 @@ self: { mkDerivation { pname = "gf"; version = "3.6"; + revision = "2"; sha256 = "10s8vgca36jz7b9sbd3n1in13xifwc7h42qwd58yq1lvk3j1fizx"; editedCabalFile = "ad294ebcd390005a243fe6d2203ec51f7ca2ab87a7f2fa7e7e080f0d416cb6a8"; isLibrary = true; @@ -49152,7 +49771,6 @@ self: { homepage = "http://github.com/vincenthz/ghc-core-html"; description = "Core to HTML display"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-datasize" = callPackage @@ -49238,16 +49856,16 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, containers, directory, filepath, ghc + ({ mkDerivation, base, containers, directory, filepath, free, ghc , ghc-paths, ghc-syb-utils, HUnit, mtl, random, stm, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.1.1.0"; - sha256 = "03wmand2dd34r2zywaqx27n80g2v9vay6k77yfgq3mcwvfvdnf4l"; + version = "0.2"; + sha256 = "1sqk6y6b1scn51kjbvdnazw34bkwmfii5dhb1fzwzx4cb4iqg3ik"; buildDepends = [ - base containers directory filepath ghc ghc-paths ghc-syb-utils mtl - syb + base containers directory filepath free ghc ghc-paths ghc-syb-utils + mtl syb ]; testDepends = [ base containers directory filepath ghc ghc-paths ghc-syb-utils @@ -49442,8 +50060,8 @@ self: { ({ mkDerivation, base, cpphs, ghc, happy }: mkDerivation { pname = "ghc-parser"; - version = "0.1.4.0"; - sha256 = "0d29bl64gsij7169wvqgdkr8vcn35jdbqyq2aky53wcbhw4kq7k7"; + version = "0.1.6.0"; + sha256 = "1j0axpzm1ysi6sv80rr2bka1wycinrnqvkpnxlb18yb3zbwijz76"; buildDepends = [ base ghc ]; buildTools = [ cpphs happy ]; patchPhase = '' @@ -49497,12 +50115,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-prim_0_3_1_0" = callPackage + "ghc-prim_0_4_0_0" = callPackage ({ mkDerivation, rts }: mkDerivation { pname = "ghc-prim"; - version = "0.3.1.0"; - sha256 = "1726hddr7lyklagni1f7m27yak35ailn1zy6401ripppj3m0f03b"; + version = "0.4.0.0"; + sha256 = "1w3hkl1xyfi67kh65gqn99pinxrfqjl2s08yg0010r907w3qys31"; buildDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; @@ -49523,9 +50141,8 @@ self: { ({ mkDerivation, array, base, containers, ghc, hpc }: mkDerivation { pname = "ghc-srcspan-plugin"; - version = "0.2.0.0"; - sha256 = "14p2c20xsng1h7129fadvhxs2yy2c865x19vybmzsj5ibjrzrqk2"; - editedCabalFile = "540c5844d127af020f38cde32f12c531f2c4953fca5e896faf2a25f33d2a3e94"; + version = "0.2.1.0"; + sha256 = "1cb669zhgibv9x7c924333kyzqa728031invr0smdnv0a2mgi2wi"; buildDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; @@ -49571,6 +50188,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, tasty, tasty-hunit }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.1"; + sha256 = "0c4kl0sz7dvyzf3hcwclcgxi631gvdmyr227d4p0v3zd4p2bs75k"; + buildDepends = [ base ghc ]; + testDepends = [ base tasty tasty-hunit ]; + jailbreak = true; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "ghc-vis" = callPackage ({ mkDerivation, base, cairo, containers, deepseq, fgl , ghc-heap-view, graphviz, gtk, mtl, svgcairo, text, transformers @@ -49719,7 +50350,6 @@ self: { buildDepends = [ base glib gtk3 mtl text transformers webkitgtk3 ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-dom-hello" = callPackage @@ -49734,7 +50364,6 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghclive" = callPackage @@ -49855,8 +50484,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.1.0.1"; - sha256 = "1za5pgnkyq0lf7fj5fdajz326kjvribd719ba21nzn2ixfzp7lri"; + version = "0.1.0.2"; + sha256 = "0d3pbssndmlzmhk88214mz77jmgqh3ca2l8si9fr5v9wi0v5d8yz"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -49927,8 +50556,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "5.20150317"; - sha256 = "1n57h97z6jw1pqxmkgfy7s24f88ypskgvsw3gcfyah9inkx1rhr5"; + version = "5.20150327"; + sha256 = "1yhqb6iig5ny90dg5ql0wbpdjza0qn8l6005d20k9dkyc9k98c0y"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -50001,7 +50630,6 @@ self: { homepage = "https://github.com/singpolyma/git-date-haskell"; description = "Bindings to the date parsing from Git"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-embed" = callPackage @@ -50287,6 +50915,18 @@ self: { license = "unknown"; }) {}; + "github-utils" = callPackage + ({ mkDerivation, base, basic-prelude, github, text }: + mkDerivation { + pname = "github-utils"; + version = "0.1.0"; + sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5"; + buildDepends = [ base basic-prelude github text ]; + homepage = "https://github.com/greenrd/github-utils"; + description = "Useful functions that use the GitHub API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -50552,8 +51192,8 @@ self: { }: mkDerivation { pname = "gl"; - version = "0.7.3"; - sha256 = "009xn7f65dahjy6qadc7c1h45gvkpv30yd5s3i6scs79cgaw9kb6"; + version = "0.7.4"; + sha256 = "08b7mayd1qfalqrr2zh8ra7mm05l2inifjamvxn84697mnvxhjg7"; buildDepends = [ base containers directory filepath fixed half hxt split transformers @@ -50763,13 +51403,13 @@ self: { mkDerivation { pname = "gloss-accelerate"; version = "1.8.15.0"; + revision = "1"; sha256 = "1nj2rnp2bg3xmi4xbaws9jc7qx3b4qqg9fyvfv13xdav28d7iqb0"; editedCabalFile = "3c0195c2208cb3c6786b8d1f27a17f5249af3797f6a37af410e95f23d03fb8d6"; buildDepends = [ accelerate accelerate-cuda base gloss ]; jailbreak = true; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -50872,7 +51512,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "gloss-raster-accelerate" = callPackage ({ mkDerivation, accelerate, accelerate-cuda, base, gloss @@ -50881,6 +51521,7 @@ self: { mkDerivation { pname = "gloss-raster-accelerate"; version = "1.8.15.0"; + revision = "2"; sha256 = "1fs3ybrzkykslac1zzh6g73lfdfysn6y2fr1pra9hd0a7x5a8j10"; editedCabalFile = "7dc701f53445822b911329368601a2de82ef2457573d6ac8ae795c74d61a5635"; buildDepends = [ @@ -50889,7 +51530,6 @@ self: { jailbreak = true; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-rendering" = callPackage @@ -51079,6 +51719,7 @@ self: { mkDerivation { pname = "goa"; version = "3.3"; + revision = "1"; sha256 = "0z1mhi2y4qm1lj6vfsmxf2gs5shfwdac3p9gqj89hx28mpc3rmzk"; editedCabalFile = "5ae2bd1f4c29e22070fa32e5c126066813467ffe71a912148304d6f30d200137"; buildDepends = [ base directory filepath process ]; @@ -51500,8 +52141,8 @@ self: { }: mkDerivation { pname = "graph-core"; - version = "0.2.1.0"; - sha256 = "0xx99p2i1ng79rph0hkb2dp5r9y77s0y4v8njsywxyq4kbl3ly7f"; + version = "0.2.2.0"; + sha256 = "0czqcdg7w7al7gl339b9l15kn5n79zmdjbic3gn9mblnjb1666r9"; buildDepends = [ base containers deepseq hashable mtl QuickCheck safe unordered-containers vector @@ -52259,7 +52900,6 @@ self: { homepage = "http://github.com/iand675/growler"; description = "A revised version of the scotty library that attempts to be simpler and more performant"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gruff" = callPackage @@ -52325,7 +52965,6 @@ self: { buildDepends = [ base hierarchical-clustering ]; description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gsl-random" = callPackage @@ -52822,7 +53461,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -53705,6 +54343,7 @@ self: { mkDerivation { pname = "hackage-db"; version = "1.22"; + revision = "1"; sha256 = "0rhh7w4929zkwzv10ika952yiw4dkffqd8f79f1bl76lz1la6cjd"; editedCabalFile = "b5277a8cbbfcfba81f29db4910003c2fa7e34c06bceb4f3e7318510e1ce74376"; buildDepends = [ @@ -53737,6 +54376,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hackage-mirror" = callPackage + ({ mkDerivation, aws, base, bytestring, cereal, conduit + , conduit-extra, cryptohash, data-default, directory, exceptions + , fast-logger, filepath, http-conduit, lifted-async, lifted-base + , mmorph, monad-control, monad-logger, old-locale + , optparse-applicative, resourcet, retry, shakespeare, stm, tar + , template-haskell, temporary, text, thyme, transformers + , unordered-containers + }: + mkDerivation { + pname = "hackage-mirror"; + version = "0.1.0.0"; + revision = "1"; + sha256 = "1iaaxdn4lsfrjksax8c9pawrjwj4sb6irqd4sfkdm3k9l2f8nqvg"; + editedCabalFile = "848ea26073e706a9303ec1baf811a74b65859ae649731a3b799b4fb8c558c1bc"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aws base bytestring cereal conduit conduit-extra cryptohash + data-default directory exceptions fast-logger filepath http-conduit + lifted-async lifted-base mmorph monad-control monad-logger + old-locale optparse-applicative resourcet retry shakespeare stm tar + template-haskell temporary text thyme transformers + unordered-containers + ]; + homepage = "http://fpcomplete.com"; + description = "Simple mirroring utility for Hackage"; + license = stdenv.lib.licenses.mit; + }) {}; + "hackage-plot" = callPackage ({ mkDerivation, base, bytestring, containers, directory , download-curl, filepath, gnuplot, old-locale, old-time, parsedate @@ -53929,8 +54598,8 @@ self: { }: mkDerivation { pname = "hackport"; - version = "0.4.4"; - sha256 = "02mif1k12aq2incn8rjgn48c7rpjmxlgncyr5l7w1k1mav0p02hd"; + version = "0.4.5"; + sha256 = "18sv8kwhg0frsn6phg47hsm5vv84yaxxvk47sazgrb5hjl3qiam7"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -53985,8 +54654,8 @@ self: { }: mkDerivation { pname = "haddock"; - version = "2.15.0.2"; - sha256 = "07mbdjjr0q7k6f86xdlx4a998ly4g8c44m54am1a5jl07cwv9fxx"; + version = "2.16.0"; + sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa"; isLibrary = false; isExecutable = true; buildDepends = [ base haddock-api ]; @@ -53997,7 +54666,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddock-api" = callPackage + "haddock-api_2_15_0_2" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , deepseq, directory, filepath, ghc, ghc-paths, haddock-library , xhtml @@ -54015,6 +54684,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-api" = callPackage + ({ mkDerivation, array, base, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-paths, haddock-library + , xhtml + }: + mkDerivation { + pname = "haddock-api"; + version = "2.16.0"; + sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj"; + buildDepends = [ + array base bytestring Cabal containers deepseq directory filepath + ghc ghc-paths haddock-library xhtml + ]; + jailbreak = true; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haddock-leksah" = callPackage ({ mkDerivation, array, base, Cabal, containers, directory , filepath, ghc, ghc-paths, pretty @@ -54052,6 +54740,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haddock-library_1_2_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec + , QuickCheck, transformers + }: + mkDerivation { + pname = "haddock-library"; + version = "1.2.0"; + sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56"; + buildDepends = [ base bytestring deepseq transformers ]; + testDepends = [ + base base-compat bytestring deepseq hspec QuickCheck transformers + ]; + homepage = "http://www.haskell.org/haddock/"; + description = "Library exposing some functionality of Haddock"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haddocset" = callPackage ({ mkDerivation, base, Cabal, conduit, conduit-extra, exceptions , ghc, haddock-api, mtl, optparse-applicative, process, resourcet @@ -54123,6 +54828,7 @@ self: { mkDerivation { pname = "hadoop-tools"; version = "0.6"; + revision = "2"; sha256 = "1nkkv9i0qk4k9vijabf1lylq8wsfsycllxvkza7abljii5jpj5fp"; editedCabalFile = "31166d3ed285e22977d237a1ae42d29b33503ad7be39c11f97b5890571da19ec"; isLibrary = false; @@ -54406,8 +55112,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.6.7.0"; - sha256 = "19mjmi2djb2n3y9jafqk1xpix95i5gdx3y3ylfb1i9hkgxl03f5l"; + version = "4.6.7.1"; + sha256 = "125yp7ng3w91n6gvalbm3g1fj7p4zfx6fzdjcdgil2fsrcsxbcy6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -54576,6 +55282,7 @@ self: { mkDerivation { pname = "half"; version = "0.2.0.1"; + revision = "1"; sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw"; editedCabalFile = "cfadc0b87a5d9c4cc9a3ab5d7a5524221ae88e962f812eb41beba7b39111ccce"; buildDepends = [ base ]; @@ -55060,7 +55767,6 @@ self: { safecopy text time unordered-containers web-routes web-routes-happstack ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -55223,7 +55929,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-foundation" = callPackage @@ -55320,7 +56025,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hstringtemplate" = callPackage @@ -55437,8 +56141,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.1"; - sha256 = "0y3y4im18vihh4phhb6mx194gdz02z46mxrfgvf8kmg3db5bmqlk"; + version = "7.4.2"; + sha256 = "0fwxc3i0ghv0acasrpzvvbji679wg614kmpdka8p0g3cmhlrpfrg"; buildDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -55448,7 +56152,6 @@ self: { utf8-string xhtml zlib ]; testDepends = [ base bytestring containers HUnit parsec zlib ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -55564,6 +56267,7 @@ self: { mkDerivation { pname = "happy"; version = "1.19.5"; + revision = "1"; sha256 = "1nj353q4z1g186fpjzf0dnsg71qhxqpamx8jy89rjjvv3p0kmw32"; editedCabalFile = "d6a01f50aab2c480799b7d19643c5bb01891e01ac97aa892ffec3e6029a1446c"; isLibrary = false; @@ -55647,6 +56351,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "har" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, text + }: + mkDerivation { + pname = "har"; + version = "0.1.1.0"; + sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3"; + buildDepends = [ aeson base bytestring directory filepath text ]; + homepage = "https://github.com/freizl/har"; + description = "HAR spec in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "harchive" = callPackage ({ mkDerivation, base, binary, network, openssl, parsec, sqlite , unix, zlib @@ -55700,7 +56417,6 @@ self: { jailbreak = true; description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { groonga = null;}; "haroonga-httpd" = callPackage @@ -55917,6 +56633,7 @@ self: { mkDerivation { pname = "hashable-extras"; version = "0.2.0.1"; + revision = "1"; sha256 = "09y2m0wpim7sl7n9qnkr0miwfsbvb1q8lm6shpcq0jxzxknbag7s"; editedCabalFile = "0797bee08c6190172fa48ce7f2821160efcd26f9fcf2afce08ea64737c1aef7d"; buildDepends = [ @@ -55952,11 +56669,10 @@ self: { ({ mkDerivation, base, hashable, time }: mkDerivation { pname = "hashable-time"; - version = "0.1.0.0"; - sha256 = "0n6cp5amc0385qaii7xi54a3l0znnycrbn4zixidm5nixiig9sq3"; + version = "0.1.0.1"; + sha256 = "1137cc7jyyn293g3nx9bs4mw4r8i7k9cq0rz5f5rs7j8997gkmbf"; buildDepends = [ base hashable time ]; - homepage = "https://github.com/w3rs/hashable-time"; - description = "Hashable instances for Data.Time types and Fixed"; + description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56054,6 +56770,7 @@ self: { mkDerivation { pname = "hask"; version = "0"; + revision = "1"; sha256 = "1c87jxafxpnlyblhdif4br61wqvnad0s6hvfhmzhx9y1jri3rb39"; editedCabalFile = "04abcba45a7fbaa11d7f3bd9834f1e70a30f356ae871e59ab472f20d4cd60026"; buildDepends = [ @@ -56244,14 +56961,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskeline_0_7_2_0" = callPackage + "haskeline_0_7_2_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , terminfo, transformers, unix, utf8-string }: mkDerivation { pname = "haskeline"; - version = "0.7.2.0"; - sha256 = "1pzvps7r53zwjcw1klc025ll786qzlp6y6k4w37ycz2g44fmd2f2"; + version = "0.7.2.1"; + sha256 = "09v4vy6nf23b13ws9whdqwv84mj1nhnla88rw2939qyqxb4a6mmf"; buildDepends = [ base bytestring containers directory filepath terminfo transformers unix utf8-string @@ -56310,6 +57027,7 @@ self: { mkDerivation { pname = "haskell-awk"; version = "1.1"; + revision = "3"; sha256 = "0ic21rfm35jp7476pm6ggkp4faqsn9rhvzb58b497ilgj9wzv1dp"; editedCabalFile = "dda4e94c57a8fce2f7d269dc09363ee84b71b33863bf1601347fa5a4b1a55698"; isLibrary = true; @@ -56439,6 +57157,7 @@ self: { text unordered-containers ]; testDepends = [ base ]; + jailbreak = true; homepage = "http://github.com/chrisdone/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; @@ -56605,8 +57324,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.0.13"; - sha256 = "1j2ka83s4fa8aqqnhvp83zqlp019ayznlkhd7pb6pqkd19npr78a"; + version = "0.3.0.15"; + sha256 = "1gxnwz7xzf4l0d4hwi8ij95910d38l89i9x3sw051zwn4fzns1cv"; buildDepends = [ aeson base bytestring containers data-default hashable HTTP http-conduit http-types lifted-base mtl resourcet scientific text @@ -56648,7 +57367,9 @@ self: { mkDerivation { pname = "haskell-packages"; version = "0.2.4.4"; + revision = "1"; sha256 = "1n4il9vkszr48n0zg3kccyqa744p0cc6idamdk6xb6hj0flpqzzc"; + editedCabalFile = "0d8b5e0dd102cc4c6aac5bc12e523d5c2ad94d981f33792b459d9373bb25c399"; buildDepends = [ aeson base bytestring Cabal containers deepseq directory filepath haskell-src-exts hse-cpp mtl optparse-applicative tagged @@ -56863,12 +57584,13 @@ self: { mkDerivation { pname = "haskell-src-meta"; version = "0.6.0.8"; + revision = "1"; sha256 = "1fv228n9zbqa52aif7pkylrqgz2n63xhxly9f828i18xf02rmxnk"; + editedCabalFile = "98609677e15a08af231b3bb957670cb1de50132625a36ef1fc83d530fb319f8a"; buildDepends = [ base haskell-src-exts pretty syb template-haskell th-orphans uniplate ]; - jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -56960,8 +57682,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.2.8"; - sha256 = "0xkp413s13gg11xc7x2c9gjxla3hcnk97wxfdj5zqrdvv757vp7x"; + version = "1.2.9"; + sha256 = "0nd8xjlyr8zjrqj9mw6xpn3rxsj9vpb8khc6hq6dc5agmldl9z7a"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -57944,15 +58666,15 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.7.2"; - sha256 = "1gxigzmsrn3kpp6nf4my3yz2215sgmr9021qnpvsq6mqnl6vqddg"; + version = "0.7.3"; + sha256 = "0a8wcncqz2k1lj2cad96rg9xi9116q0x209jfbpkcp8sbi3n3rb8"; buildDepends = [ attoparsec base base-prelude either hasql-backend list-t mmorph monad-control mtl resource-pool template-haskell text transformers transformers-base vector ]; testDepends = [ - base base-prelude either hasql-backend hasql-postgres hspec + base-prelude either hasql-backend hasql-postgres hspec monad-control mtl-prelude slave-thread text vector ]; homepage = "https://github.com/nikita-volkov/hasql"; @@ -57961,16 +58683,15 @@ self: { }) {}; "hasql-backend" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, either, free - , list-t, text, transformers, vector + ({ mkDerivation, base-prelude, bytestring, either, free, list-t + , text, transformers, vector }: mkDerivation { pname = "hasql-backend"; - version = "0.4.0"; - sha256 = "15jzz01lmh4s6y70b01yc7ffzbicm7nxna30krra8vlp0w32lnys"; + version = "0.4.1"; + sha256 = "037ibla582gwsi17fsfrwlc0azh54iyyfawvy0nlabzg6lc38snm"; buildDepends = [ - base base-prelude bytestring either free list-t text transformers - vector + base-prelude bytestring either free list-t text transformers vector ]; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; @@ -57987,10 +58708,10 @@ self: { }: mkDerivation { pname = "hasql-postgres"; - version = "0.10.2"; - sha256 = "0nw1xq9wfdhcm40qfx8d883nvgk7bfhwbwwb1r9jx7zlspx15vq5"; + version = "0.10.3"; + sha256 = "12452z4li3b30zw1ar4x2r14q93vx06165g3rdj9s1wxjzsnsr4w"; buildDepends = [ - aeson attoparsec base base-prelude bytestring either free hashable + aeson attoparsec base-prelude bytestring either free hashable hashtables hasql-backend list-t loch-th mmorph placeholders postgresql-binary postgresql-libpq scientific template-haskell text time transformers uuid vector @@ -58007,15 +58728,14 @@ self: { }) {}; "hasql-postgres-options" = callPackage - ({ mkDerivation, base, base-prelude, hasql-postgres - , optparse-applicative + ({ mkDerivation, base-prelude, hasql-postgres, optparse-applicative }: mkDerivation { pname = "hasql-postgres-options"; - version = "0.1.3"; - sha256 = "05l38fm1s5n2vsqmxx8pywq0bpbwhc9hks381a70dqdas3jvv3cp"; + version = "0.1.4"; + sha256 = "19jsi8r63phyjcwgvbbs30idl944dnl0iw15i0q2d501sa51ksf4"; buildDepends = [ - base base-prelude hasql-postgres optparse-applicative + base-prelude hasql-postgres optparse-applicative ]; homepage = "https://github.com/nikita-volkov/hasql-postgres-options"; description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; @@ -58030,6 +58750,7 @@ self: { mkDerivation { pname = "hastache"; version = "0.6.1"; + revision = "2"; sha256 = "0r5l8k157pgvz1ck4lfid5x05f2s0nlmwf33f4fj09b1kmk8k3wc"; editedCabalFile = "92cea66e7c2d33e62c5caac8eaaf0e716fa6e2146ef906360db4d5f72cd30091"; isLibrary = true; @@ -58128,7 +58849,6 @@ self: { homepage = "https://github.com/agocorona/haste-perch"; description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hat" = callPackage @@ -58164,7 +58884,6 @@ self: { base blaze-html directory filepath HaTeX parsec text time transformers ]; - jailbreak = true; description = "HaTeX User's Guide"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58343,6 +59062,7 @@ self: { mkDerivation { pname = "haxy"; version = "1.0"; + revision = "2"; sha256 = "1fzdxk0vl7pd3k1dgxli6f721lfvwpb2zl354fl0zy5gimiky7fs"; editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940"; buildDepends = [ @@ -58784,8 +59504,8 @@ self: { }: mkDerivation { pname = "hdbc-aeson"; - version = "0.1.3.0"; - sha256 = "1mqcpzp9fw604nab0zs9r8515072pwbkfr4vvdpjhbdny5022naw"; + version = "0.1.3.2"; + sha256 = "04bp1zxw5alazk241gbz7g1s4cr0gabb7c15irzzlkbjz5jsk6d5"; buildDepends = [ aeson base convertible HDBC scientific text unordered-containers vector @@ -58971,7 +59691,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hdf"; description = "HDF: Uniform Rate Audio Signal Processing in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdigest" = callPackage @@ -59047,21 +59766,23 @@ self: { "hdocs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , filepath, ghc, ghc-paths, haddock-api, MonadCatchIO-transformers - , mtl, network, process, text, transformers + , filepath, ghc, ghc-paths, haddock-api, haddock-library + , MonadCatchIO-transformers, mtl, network, process, text + , transformers }: mkDerivation { pname = "hdocs"; - version = "0.4.1.2"; - sha256 = "1dg4cnj3cnv2f12ibvfg451rhsgawhsj0brjmaxm73bfvbxl25vi"; + version = "0.4.2.0"; + sha256 = "1qsahvm24hxjzfd0qvyfsasdplh2hbg9fkxcdkysgqxpzq8kx4gb"; isLibrary = true; isExecutable = true; buildDepends = [ aeson aeson-pretty base bytestring containers filepath ghc - ghc-paths haddock-api MonadCatchIO-transformers mtl network process - text transformers + ghc-paths haddock-api haddock-library MonadCatchIO-transformers mtl + network process text transformers ]; testDepends = [ base containers mtl ]; + jailbreak = true; homepage = "https://github.com/mvoidex/hdocs"; description = "Haskell docs tool"; license = stdenv.lib.licenses.bsd3; @@ -59198,6 +59919,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis-config" = callPackage + ({ mkDerivation, aeson, base, hedis, scientific, text, time }: + mkDerivation { + pname = "hedis-config"; + version = "0.0.1"; + sha256 = "1c524klmsl8n6alphxdmwm4hw05hhq3rcyb5540ksnnys77b8y2b"; + buildDepends = [ aeson base hedis scientific text time ]; + homepage = "https://bitbucket.org/s9gf4ult/hedis-config"; + description = "Easy trivial configuration for Redis"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hedis-monadic" = callPackage + ({ mkDerivation, base, hedis, monad-control, mtl, transformers + , transformers-base, transformers-compat + }: + mkDerivation { + pname = "hedis-monadic"; + version = "0.0.3"; + sha256 = "1z80kdm1cs1pk6fpbby20q49ji840zp9xwbynbry2v43g5q18lq6"; + buildDepends = [ + base hedis monad-control mtl transformers transformers-base + transformers-compat + ]; + homepage = "https://bitbucket.org/s9gf4ult/redis-monadic"; + description = "A la MonadReader for Redis connection"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hedis-pile" = callPackage ({ mkDerivation, base, binary, bytestring, hedis, hedis-tags, HUnit , lifted-base, string-conversions, test-framework @@ -59285,6 +60035,7 @@ self: { mkDerivation { pname = "heist"; version = "0.14.1"; + revision = "1"; sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy"; editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e"; buildDepends = [ @@ -59334,8 +60085,10 @@ self: { }: mkDerivation { pname = "helics"; - version = "0.5.0.1"; - sha256 = "0kqmqyf22fjcbsqlbyxmg6238im8kp6baip3v8f7hibkpgyfqip1"; + version = "0.5.1"; + revision = "1"; + sha256 = "06kj42rmlzlw6zrilq9kc5whk0np5714wwn3nwbpv6fx4ginzg2c"; + editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59357,8 +60110,8 @@ self: { }: mkDerivation { pname = "helics-wai"; - version = "0.5.0"; - sha256 = "1d1kaik2aj0vnln4nbj958d7ay7adb6l62fx606y7xlp7zyhysr4"; + version = "0.5.1"; + sha256 = "10rb9l4sf31h59f5pwv54vqjnlm047mbq5gvhv5wblkh53ch1b31"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -59987,12 +60740,11 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.2"; - sha256 = "1k4ixqwpsa4mnywd1fcfrmy2dbcpkna0hg0sxjlfp0qbhy1ik7v7"; + version = "0.1.3"; + sha256 = "0283zpzj1xsav50d4k66i90fhll89flqnb1jv0x7gxppv1460vfr"; buildDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; - jailbreak = true; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; }) {}; @@ -60511,7 +61263,6 @@ self: { testDepends = [ base hspec HUnit QuickCheck ]; description = "Fast algorithms for single, average/UPGMA and complete linkage clustering"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hierarchical-clustering-diagrams" = callPackage @@ -60603,6 +61354,7 @@ self: { mkDerivation { pname = "higherorder"; version = "0.0"; + revision = "1"; sha256 = "06cqhk9jalyps4v9w6wmpy9jdj3piwsp0wl3fvkzwa5iydlyvisz"; editedCabalFile = "c587250ea9c4828876f3837e82e5b1543e0dc2cc59bb4ec59ce0d947bae3d459"; buildDepends = [ base ]; @@ -60667,8 +61419,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.5.12"; - sha256 = "0igcph3icmskf2g861fmxwgjdgrm52r5zazviiv82wck8nvmkh0i"; + version = "0.5.14"; + sha256 = "0hpg2f660s035gj0fzy42s52adgqlgssn7pf2k0bcxml3qxf3jnr"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61363,39 +62115,38 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "0.1.0.1"; - sha256 = "03c0hl4hzgihkqla7kqkjk5s1k68pnblqpisjrzf4bzjl8z1z6hw"; + version = "0.2.0.1"; + sha256 = "0r44fpljqwzwzj818p3xplhwkdbndwmbxf2mrgdqsjxj0dmnifhq"; buildDepends = [ aeson base text unordered-containers vector ]; testDepends = [ aeson base http-types HUnit test-framework test-framework-hunit text unordered-containers vector ]; homepage = "https://github.com/seagreen/hjsonpointer"; - description = "JSON Pointer library for Haskell"; + description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; }) {}; "hjsonschema" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, file-embed - , filepath, hashable, hjsonpointer, http-types, HUnit, lens + , filepath, hashable, hjsonpointer, http-client, http-types, HUnit , regexpr, scientific, test-framework, test-framework-hunit, text - , unordered-containers, vector, wreq + , unordered-containers, vector }: mkDerivation { pname = "hjsonschema"; - version = "0.4.0.0"; - sha256 = "0jak4ffjhbpwcmbx5jp6pbba52xr9zyhjjwn9y5gdqjny2scnb67"; + version = "0.5.3.1"; + sha256 = "1ggqxi2f10qdls67lk3204wc4naicchr20i00p17ynkzxl9ndi8b"; buildDepends = [ - aeson base bytestring file-embed hashable hjsonpointer http-types - lens regexpr scientific text unordered-containers vector wreq + aeson base bytestring file-embed hashable hjsonpointer http-client + http-types regexpr scientific text unordered-containers vector ]; testDepends = [ aeson base bytestring directory filepath HUnit test-framework test-framework-hunit text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/seagreen/hjsonschema"; - description = "Haskell implementation of JSON Schema Draft 4"; + description = "JSON Schema Draft 4 library"; license = stdenv.lib.licenses.mit; }) {}; @@ -61553,7 +62304,6 @@ self: { buildDepends = [ base Cabal Decimal hledger-lib statistics time ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hledger-lib" = callPackage @@ -61695,8 +62445,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.18"; - sha256 = "03wdfl0jmb5szcv61dd8cm0xh5z6qhpy0d5xf6wh3lybma9pjmsb"; + version = "1.9.19"; + sha256 = "07wibincqgz0sqvc00c06r5am2iyiknrrnywc8023rafajv3079p"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -61755,7 +62505,9 @@ self: { mkDerivation { pname = "hlwm"; version = "0.1.0.1"; + revision = "1"; sha256 = "1vp21440v9gq4mvnqnsw1ha72ywgc4hmp137pkpvs5p13ixyfrgi"; + editedCabalFile = "ce22b9186e03c83f13e56b33630f4af561b604c51374c23dc1ef4e24ced9a54e"; isLibrary = true; isExecutable = true; buildDepends = [ base monads-tf stm transformers unix X11 ]; @@ -61879,17 +62631,20 @@ self: { }) { inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, hmatrix, storable-complex }: + ({ mkDerivation, base, binary, blas, hmatrix, lapack + , storable-complex + }: mkDerivation { pname = "hmatrix-gsl-stats"; - version = "0.2"; - sha256 = "1xwl2qgji2ib0gml9hqljzwd4wrqfjpvnzm3iq2g7kcwwfg1q0dm"; + version = "0.2.1"; + sha256 = "1sfyvp5dlxcfqwpfwzqly9h8g26lm8470xaqcw6nj15dya1zl1fj"; buildDepends = [ base binary hmatrix storable-complex ]; + extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) blas; lapack = null;}; "hmatrix-mmap" = callPackage ({ mkDerivation, base, hmatrix, mmap }: @@ -62084,7 +62839,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "Binding to the OS level MIDI services"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmk" = callPackage @@ -62297,8 +63051,8 @@ self: { }: mkDerivation { pname = "hoauth2"; - version = "0.4.5"; - sha256 = "1lxn7ykk24a0kj9y36mwyd52xgw0hfvf3mqqm7m8ikrnpqps5nrs"; + version = "0.4.6"; + sha256 = "1sn2m1vpbkbiv7lyhffgkcs1ck7680qqgi7d8hk2b02ca53lw8wp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62388,7 +63142,6 @@ self: { homepage = "http://github.com/tanakh/hoe"; description = "hoe: Haskell One-liner Evaluator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hofix-mtl" = callPackage @@ -62495,6 +63248,7 @@ self: { mkDerivation { pname = "hoist-error"; version = "0.1.0.2"; + revision = "1"; sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z"; editedCabalFile = "900b08c7b95c9490dfc65334b32c1fdcb4a578e458f47dbfa58108c433fe7a8a"; buildDepends = [ base either mtl ]; @@ -62873,8 +63627,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "4.2.38"; - sha256 = "0ijd23chnkcmymn1yf4rb7jbsbdnjxjvld7wsikp85ar1l3s858a"; + version = "4.2.39"; + sha256 = "0n3sh13lhg9aip1390by0wfdfsrnqz61zgs6ji143ak7fdff1559"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -62898,8 +63652,8 @@ self: { }: mkDerivation { pname = "hoogle-index"; - version = "0.4.0"; - sha256 = "0a7zkpqcjx225c3prwca8cs8sai0yaxv56vsb0in1s9p86qw1gfv"; + version = "0.4.1"; + sha256 = "09ax7y205ds8wb99qmwszclam8p9s9swv0byf0ap2qiz948gjfbg"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -63013,8 +63767,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.14"; - sha256 = "16syq600zgq5b60ghvxnnaskn984bqv60024bvpgzydv41l61lcd"; + version = "0.14.1"; + sha256 = "0ckmz6v6y8lwbpx0aw4a5japxgx1m664p7pgrblsbw9pn5yjrkcw"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -63177,7 +63931,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hosc-json"; description = "Haskell Open Sound Control JSON Serialisation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc-utils" = callPackage @@ -63256,6 +64009,7 @@ self: { buildDepends = [ base cmdargs containers cpphs filepath haskell-src-exts ]; + jailbreak = true; homepage = "http://github.com/luqui/hothasktags"; description = "Generates ctags for Haskell, incorporating import lists and qualified imports"; license = stdenv.lib.licenses.bsd3; @@ -63282,6 +64036,7 @@ self: { mkDerivation { pname = "hourglass"; version = "0.2.8"; + revision = "1"; sha256 = "1n5kffmf9qnr2zy6igck7rlrw0gx5lqc92n1lajpa8vq96qzx7lj"; editedCabalFile = "df23ba9b63af9fd6ed50bdbde1c2a2b43dc702e68a85722a49cd1ff1b21894b5"; buildDepends = [ base deepseq ]; @@ -63576,8 +64331,8 @@ self: { }: mkDerivation { pname = "hplayground"; - version = "0.1.2.8"; - sha256 = "1jz82d9z27zci1dl0d33xc1q96dip3b86f8i2dhxyahpi9p7khjm"; + version = "0.1.2.9"; + sha256 = "090j08ygfjsmhyfdg0azl0qwfm0i96yyk67xnwyv1as56r2pvn6r"; buildDepends = [ base containers data-default haste-compiler haste-perch monads-tf transformers @@ -63585,7 +64340,6 @@ self: { homepage = "https://github.com/agocorona/hplayground"; description = "monadic, reactive Formlets running in the Web browser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hplaylist" = callPackage @@ -63870,14 +64624,14 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.2.8"; - sha256 = "1gwz8fncwrga8qpin2799pfr5x34k01fvav8g3d9n6ibn24ah7f0"; + version = "0.3.1"; + sha256 = "1w13j70r6b66nyjj2fsa1z1m5p8v0zil6jf31x0h0f222x4fvmih"; buildDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector ]; testDepends = [ aeson attoparsec base QuickCheck text vector ]; - description = "Embed Ruby in your Haskell program"; + description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -64090,6 +64844,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-inspector" = callPackage + ({ mkDerivation, base, haskell-src, hspec }: + mkDerivation { + pname = "hs-inspector"; + version = "0.1.0.0"; + sha256 = "1vphymvkzm1gjs0dkazcbkifshiwwdh9rmnblpz59n4982wly6fp"; + buildDepends = [ base haskell-src ]; + testDepends = [ base haskell-src hspec ]; + license = stdenv.lib.licenses.mit; + }) {}; + "hs-java" = callPackage ({ mkDerivation, array, base, binary, binary-state, bytestring , containers, control-monad-exception, data-binary-ieee754 @@ -64107,7 +64872,6 @@ self: { ]; description = "Java .class files assembler/disassembler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-json-rpc" = callPackage @@ -64169,7 +64933,6 @@ self: { ]; extraLibraries = [ mesos protobuf ]; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) mesos; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage @@ -64391,6 +65154,7 @@ self: { mkDerivation { pname = "hsConfigure"; version = "0.1.0.2"; + revision = "2"; sha256 = "199sza2jh3d5046yyb141b0jwh1m1p68hv4x3b5xz6vw9dzfbw3c"; editedCabalFile = "ab3264ebf799e07e40fd913b9061197b346a7d84145908566155231e62a45c02"; buildDepends = [ base directory filepath process unix ]; @@ -64573,7 +65337,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3"; description = "Haskell SuperCollider"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-auditor" = callPackage @@ -64587,7 +65350,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-cairo" = callPackage @@ -64632,7 +65394,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-db"; description = "Haskell SuperCollider Unit Generator Database"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-dot" = callPackage @@ -64645,7 +65406,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-dot"; description = "haskell supercollider graph drawing"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-forth" = callPackage @@ -64771,7 +65531,6 @@ self: { homepage = "https://github.com/kaoskorobase/hsc3-process"; description = "Create and control scsynth processes"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-rec" = callPackage @@ -64843,7 +65602,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-sf-hsndfile" = callPackage @@ -64860,7 +65618,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsc3-unsafe" = callPackage @@ -64894,7 +65651,6 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-utils"; description = "Haskell SuperCollider Utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscamwire" = callPackage @@ -65078,7 +65834,6 @@ self: { homepage = "http://rd.slavepianos.org/?t=hsdif"; description = "Haskell SDIF"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdip" = callPackage @@ -65345,23 +66100,24 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, bytestring, hmatrix - , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, mtl + ({ mkDerivation, array, base, binary, blas, bytestring, hmatrix + , hmatrix-gsl, hmatrix-gsl-stats, hstatistics, lapack, mtl , storable-complex }: mkDerivation { pname = "hsignal"; - version = "0.2.6.1"; - sha256 = "013sswmhvww16kbfmm9mmb1iabzmd41jfq06ppl5fjs5amqlinsk"; + version = "0.2.7"; + sha256 = "1a75n22rk5lpzf1fnwdpw61azibavy9x45wz1cp0l1c49477fxs0"; buildDepends = [ array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats hstatistics mtl storable-complex ]; + extraLibraries = [ blas lapack ]; homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) { inherit (pkgs) blas; lapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, haskeline }: @@ -65580,6 +66336,23 @@ self: { inherit (pkgs) libxml2; tiff = null; wmflite = null; inherit (pkgs) zlib;}; + "hsmisc" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec + , regex-compat, time + }: + mkDerivation { + pname = "hsmisc"; + version = "1.1"; + sha256 = "1n340agvf103g84xndc9fbhq4rhywx611iykmkk10wxi364dv7wg"; + buildDepends = [ + base containers mtl old-locale parsec regex-compat time + ]; + testDepends = [ base containers HUnit mtl regex-compat ]; + homepage = "http://foo/bar/baz.html"; + description = "A collection of miscellaneous modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsmtpclient" = callPackage ({ mkDerivation, array, base, directory, network, old-time }: mkDerivation { @@ -65822,8 +66595,8 @@ self: { }: mkDerivation { pname = "hspec"; - version = "2.1.4"; - sha256 = "0g0wv0mvc367fi14ibi9pbxclna7kppyxgfl4axhhr5qxvhf686p"; + version = "2.1.5"; + sha256 = "0lj8inhp0lxh23ayc3wcj5c7rslwr4q6s6wqswhda0v3cz3lfmsc"; buildDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -65843,8 +66616,8 @@ self: { }: mkDerivation { pname = "hspec-attoparsec"; - version = "0.1.0.1"; - sha256 = "12246p4k0axv6w5jxnid9hyl4cbl3vmd46b7xxli7nq2iw79nl8v"; + version = "0.1.0.2"; + sha256 = "0r7v6x0k5r8jxl0rnsq8h3gqhbiimsic3kiphn6dxaw954zqnypa"; buildDepends = [ attoparsec base bytestring hspec-expectations text ]; @@ -65889,8 +66662,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.1.4"; - sha256 = "0x2azc1km06f4br2pdnklkz08ali1chysi0wdwwk3j9f0lqp6jj7"; + version = "2.1.5"; + sha256 = "1za9ybkcqrzgrmqvzijvw471yk5kjhp0pr0n47n4f4cy0ha7l0fb"; buildDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -65909,8 +66682,8 @@ self: { ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; - version = "2.1.4"; - sha256 = "1nabyjxjsrh7901bzv88b28gcja1shiznw9n2q2l3gfq6hxfzvqw"; + version = "2.1.5"; + sha256 = "03bs5gxzhn605f8k7wdm629kzsmxy5mjb1v834q69f3w1iczx304"; isLibrary = true; isExecutable = true; buildDepends = [ base directory filepath ]; @@ -66022,8 +66795,8 @@ self: { }: mkDerivation { pname = "hspec-meta"; - version = "2.0.0"; - sha256 = "0x1k2d4nycglzn9l4i32xrampr9fgzjpp4j1jyy7pj89cfl8jc8f"; + version = "2.1.5"; + sha256 = "02v4a5hcp4bbvnjb18vpw6fwz4qxjll8k8ama0hf6y8jppp72hid"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -66210,6 +66983,7 @@ self: { mkDerivation { pname = "hspec2"; version = "0.6.1"; + revision = "1"; sha256 = "0zlvm7r46q8yhgx2kx9mfrf6x2f5amdbi3a59fh69dsqs4lbgmf4"; editedCabalFile = "d41ebaf2f80c6ae149a944cd77e31fce98c0eea45cf47a561c5c25d48e03107f"; buildDepends = [ base hspec hspec-discover ]; @@ -66301,6 +67075,7 @@ self: { mkDerivation { pname = "hsql-mysql"; version = "1.8.3"; + revision = "1"; sha256 = "0834jr5jrr1m7ap93wvmb5ir0906f7f7xx52x21i1l1jfpan34j9"; editedCabalFile = "e1bbb71ecb6e310acf23a93e4a5e0121c8bd332e7a81dfa5bfe27ae94cbf14ab"; buildDepends = [ base Cabal hsql ]; @@ -66381,7 +67156,6 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-notes" = callPackage @@ -66396,7 +67170,6 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-samples" = callPackage @@ -66733,7 +67506,6 @@ self: { homepage = "http://www.happstack.com/"; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -66766,7 +67538,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -67353,25 +68124,25 @@ self: { "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , case-insensitive, certificate, conduit, containers, cookie - , data-default, failure, hspec, http-conduit, http-types, HUnit - , lifted-base, monad-control, network, network-conduit, resourcet - , socks, text, time, tls, transformers, wai, warp + , case-insensitive, conduit, containers, cookie, data-default + , exceptions, hspec, http-client, http-conduit, http-types, HUnit + , lifted-base, monad-control, network, network-uri, resourcet, text + , time, transformers, transformers-base, wai, warp }: mkDerivation { pname = "http-conduit-browser"; - version = "1.9.0.2"; - sha256 = "05jbxqigld9bg26gfl37c3axcxjjhm0hwp63yy8rphqp0yr4z5lc"; + version = "2.0.0.0"; + sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q"; buildDepends = [ - base bytestring case-insensitive certificate conduit containers - cookie data-default failure http-conduit http-types lifted-base - monad-control network resourcet socks time tls transformers + base bytestring conduit containers cookie data-default exceptions + http-client http-conduit http-types lifted-base monad-control + network-uri resourcet time transformers transformers-base ]; testDepends = [ base base64-bytestring blaze-builder bytestring case-insensitive - certificate conduit containers cookie data-default failure hspec + conduit containers cookie data-default hspec http-client http-conduit http-types HUnit lifted-base monad-control network - network-conduit resourcet socks text time tls transformers wai warp + resourcet text time transformers wai warp ]; jailbreak = true; homepage = "https://github.com/exbb2/http-conduit-browser"; @@ -67421,6 +68192,7 @@ self: { mkDerivation { pname = "http-encodings"; version = "0.9.3"; + revision = "1"; sha256 = "0b29zqa2ybja73jip83qn1xhiinn1k64b6dmc39ccp48ip1xdnvn"; editedCabalFile = "b9e6dd65c8dd4119887c084f1bd14570ab0540e723afb845212f041e871210d7"; buildDepends = [ @@ -67496,8 +68268,8 @@ self: { }: mkDerivation { pname = "http-media"; - version = "0.6.0"; - sha256 = "05vjlfa4z5g84y2vq9c4dhasjl8w55n0si0iy3fkl980jkx59771"; + version = "0.6.1"; + sha256 = "0x2smkccs64ll31adwj4n7kr1qalihyj28py2k5qwl2ynyygxbxq"; buildDepends = [ base bytestring case-insensitive containers ]; testDepends = [ base bytestring Cabal cabal-test-quickcheck case-insensitive @@ -67636,8 +68408,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.7.2.5"; - sha256 = "0dabn3d9al9lvfqk7fg3nbddbygygq4am3j7wibp48zhy3vg8m0y"; + version = "0.7.2.6"; + sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -67712,13 +68484,13 @@ self: { "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, blaze-builder - , bytestring, containers, directory, doctest, filepath, hex, hspec - , PSQueue, text, unordered-containers, vector, word8 + , bytestring, containers, directory, doctest, filepath, Glob, hex + , hspec, PSQueue, text, unordered-containers, vector, word8 }: mkDerivation { pname = "http2"; - version = "0.8.0"; - sha256 = "1hvjb22jmmfrj0ym4sk4yn2y4x9manic42w7yfy8kckhihzh1j1s"; + version = "0.9.1"; + sha256 = "1aqc8rhnh1l3f3fq6n9vjgamxjxjip52f9j01caaccrylahy57mm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -67728,7 +68500,7 @@ self: { ]; testDepends = [ aeson aeson-pretty array base blaze-builder bytestring containers - directory doctest filepath hex hspec PSQueue text + directory doctest filepath Glob hex hspec PSQueue text unordered-containers vector word8 ]; description = "HTTP/2.0 library including frames and HPACK"; @@ -68483,6 +69255,7 @@ self: { mkDerivation { pname = "hxt-pickle-utils"; version = "0.1.0.2"; + revision = "1"; sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2"; editedCabalFile = "89173b402c57c3ee7ee0eb2814e58d81e46cce5742a4f01684980b841359d2fb"; buildDepends = [ base hxt mtl ]; @@ -68659,7 +69432,9 @@ self: { mkDerivation { pname = "hybrid-vectors"; version = "0.1.2.1"; + revision = "1"; sha256 = "0xh6yvv7jyahzrqihc13g1nlv81v0mzxvaxib5fcyr1njwbcwv59"; + editedCabalFile = "9adcfe7dc98b64c7a1506a58c7a771bbc244874790b68f8bc7e1c859207632d7"; buildDepends = [ base deepseq primitive vector ]; homepage = "http://github.com/ekmett/hybrid-vectors"; description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; @@ -68753,8 +69528,8 @@ self: { }: mkDerivation { pname = "hydrogen-cli-args"; - version = "0.14"; - sha256 = "0q72w0bacaqxip26yl1qln8lrskl39wr72nphwirmdk4cxs92mx7"; + version = "0.17"; + sha256 = "1wapq5lfyvm09sl9n7zhiaxpb8iapirvizq3ak9rl17vy4iz5xl4"; buildDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; @@ -68778,12 +69553,12 @@ self: { }) {}; "hydrogen-multimap" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, ghc-prim }: mkDerivation { pname = "hydrogen-multimap"; - version = "0.1"; - sha256 = "165lxvm0yvz0jq3l520ww0fp4zb7y4azz32bvrz00z4j1dqr5vaw"; - buildDepends = [ base containers ]; + version = "0.3"; + sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93"; + buildDepends = [ base containers ghc-prim ]; homepage = "https://scravy.de/hydrogen-multimap/"; description = "Hydrogen Multimap"; license = stdenv.lib.licenses.mit; @@ -68793,8 +69568,8 @@ self: { ({ mkDerivation, base, containers, hydrogen-prelude, parsec }: mkDerivation { pname = "hydrogen-parsing"; - version = "0.14"; - sha256 = "1k422j4yjvv3zq51aincxjr96cgv86wdkicwkplfiq84jy3g3lyy"; + version = "0.17"; + sha256 = "0m9rliry031lr7bn4xkbjmar288zcrnpsbnjdyxs13v675bh7h29"; buildDepends = [ base containers hydrogen-prelude parsec ]; jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; @@ -68803,34 +69578,46 @@ self: { }) {}; "hydrogen-prelude" = callPackage - ({ mkDerivation, array, base, cereal, containers, directory - , filepath, hashable, hydrogen-multimap, hydrogen-version, network - , nicify, process, random, regex-base, regex-tdfa, strict, time - , transformers, uuid + ({ mkDerivation, array, base, binary, bytestring, cereal + , containers, directory, filepath, hashable, hydrogen-multimap + , hydrogen-version, network, process, random, regex-base + , regex-tdfa, strict, text, time, transformers, uuid }: mkDerivation { pname = "hydrogen-prelude"; - version = "0.15"; - sha256 = "1wsim8papga58z36grm0d1xh5ivxnqwnj43255cdw50w0y4jrb8f"; + version = "0.20"; + sha256 = "18g3r95ssg385zqzny3137ms0ppv7d33xgvc4gvxkijv8cgj1697"; buildDepends = [ - array base cereal containers directory filepath hashable - hydrogen-multimap hydrogen-version network nicify process random - regex-base regex-tdfa strict time transformers uuid + array base binary bytestring cereal containers directory filepath + hashable hydrogen-multimap hydrogen-version network process random + regex-base regex-tdfa strict text time transformers uuid ]; - jailbreak = true; homepage = "http://scravy.de/hydrogen-prelude/"; description = "Hydrogen Prelude"; license = stdenv.lib.licenses.mit; }) {}; + "hydrogen-prelude-parsec" = callPackage + ({ mkDerivation, base, hydrogen-prelude, parsec }: + mkDerivation { + pname = "hydrogen-prelude-parsec"; + version = "0.17"; + sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh"; + buildDepends = [ base hydrogen-prelude parsec ]; + jailbreak = true; + homepage = "http://scravy.de/hydrogen-prelude-parsec/"; + description = "Hydrogen Prelude /w Parsec"; + license = stdenv.lib.licenses.mit; + }) {}; + "hydrogen-syntax" = callPackage ({ mkDerivation, base, containers, hydrogen-parsing , hydrogen-prelude, nicify, parsec, uuid }: mkDerivation { pname = "hydrogen-syntax"; - version = "0.14"; - sha256 = "1gkhmlxcdvs1px4ffygw11mc23f64dbiwxhhp4fjif632bs7mp1v"; + version = "0.17"; + sha256 = "17j6iq2fh1s3vwkzd5js786abk1zkmj4dfg425d290k4nvdl08dv"; buildDepends = [ base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid @@ -68860,8 +69647,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hydrogen-version"; - version = "1.3"; - sha256 = "1211ynxr4l1kwkxj37gyyfjcd8mmdajrnmwg9lwlf85dn49r4xzv"; + version = "1.4"; + sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38"; buildDepends = [ base ]; homepage = "https://scravy.de/hydrogen-version/"; description = "Hydrogen Version Type"; @@ -69177,6 +69964,73 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ide-backend" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , bytestring-trie, Cabal-ide-backend, containers, crypto-api + , data-accessor, data-accessor-mtl, deepseq, directory + , executable-path, filemanip, filepath, fingertree, ghc-prim, HUnit + , ide-backend-common, mtl, pretty-show, process, pureMD5, random + , regex-compat, stm, tagged, tasty, template-haskell, temporary + , test-framework, test-framework-hunit, text, time, transformers + , unix, unordered-containers, utf8-string + }: + mkDerivation { + pname = "ide-backend"; + version = "0.9.0.4"; + sha256 = "00an3pk1im5mhrmkaal4p6i4niwjy13clsnjkh13k8g6dbr42vfv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async attoparsec base binary bytestring bytestring-trie + Cabal-ide-backend containers crypto-api data-accessor + data-accessor-mtl directory executable-path filemanip filepath + fingertree ghc-prim ide-backend-common mtl pretty-show process + pureMD5 random tagged template-haskell temporary text time + transformers unix unordered-containers utf8-string + ]; + testDepends = [ + aeson async base binary bytestring Cabal-ide-backend containers + deepseq directory executable-path filemanip filepath HUnit + ide-backend-common process random regex-compat stm tagged tasty + template-haskell temporary test-framework test-framework-hunit text + unix utf8-string + ]; + description = "An IDE backend library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ide-backend-common" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring + , bytestring-trie, containers, crypto-api, data-accessor, directory + , filepath, fingertree, mtl, pretty-show, pureMD5, tagged + , template-haskell, temporary, text, transformers, unix + }: + mkDerivation { + pname = "ide-backend-common"; + version = "0.9.0"; + sha256 = "01hp54f9yhvv3w53n5l9508kkr9h4b0ns8b669bcw6nqg5vq8642"; + buildDepends = [ + aeson async attoparsec base binary bytestring bytestring-trie + containers crypto-api data-accessor directory filepath fingertree + mtl pretty-show pureMD5 tagged template-haskell temporary text + transformers unix + ]; + description = "Shared library used be ide-backend and ide-backend-server"; + license = stdenv.lib.licenses.mit; + }) {}; + + "ide-backend-rts" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ide-backend-rts"; + version = "0.1.3.1"; + sha256 = "1zj1glpyhmgpkxy4n96aqqf3s1gl2irl8ksnx4i9y4nwvs06qzj0"; + buildDepends = [ base ]; + description = "RTS for the IDE backend"; + license = stdenv.lib.licenses.mit; + }) {}; + "ideas" = callPackage ({ mkDerivation, array, base, cgi, containers, directory, filepath , parsec, QuickCheck, random, time, uniplate, wl-pprint @@ -69302,15 +70156,15 @@ self: { , base, base64-bytestring, binary, blaze-html, blaze-markup , boehmgc, bytestring, cheapskate, containers, deepseq, directory , filepath, fingertree, gmp, happy, haskeline, lens, libffi, mtl - , network, optparse-applicative, parsers, pretty, process, split - , text, time, transformers, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , network, optparse-applicative, parsers, pretty, process, safe + , split, text, time, transformers, transformers-compat, trifecta + , uniplate, unix, unordered-containers, utf8-string, vector , vector-binary-instances, xml, zlib }: mkDerivation { pname = "idris"; - version = "0.9.16"; - sha256 = "0mnjq05v145jyj2m2v2a33ibpyf788x63agcnlb33y21684mhvcm"; + version = "0.9.17.1"; + sha256 = "16a3z7jq1pmqnb411aqn9qmirwyzpx3bqb0hrawc1404kbq7gdx7"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69318,9 +70172,9 @@ self: { base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree haskeline lens libffi mtl network optparse-applicative parsers - pretty process split text time transformers trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances xml - zlib + pretty process safe split text time transformers + transformers-compat trifecta uniplate unix unordered-containers + utf8-string vector vector-binary-instances xml zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; @@ -69479,6 +70333,7 @@ self: { mkDerivation { pname = "igrf"; version = "0.2.0.0"; + revision = "1"; sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1"; editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f"; buildDepends = [ ad base polynomial ]; @@ -69488,34 +70343,35 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , classy-prelude, cmdargs, containers, directory, filepath, ghc - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, http-client, http-client-tls, HUnit, ipython-kernel - , MissingH, mono-traversable, mtl, parsec, process, random, setenv - , shelly, split, stm, strict, system-argv0, system-filepath, tar - , template-haskell, text, transformers, unix, unordered-containers - , utf8-string, uuid, vector + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, classy-prelude, cmdargs, containers + , directory, filepath, ghc, ghc-parser, ghc-paths, haskeline + , haskell-src-exts, here, hlint, hspec, http-client + , http-client-tls, HUnit, ipython-kernel, MissingH + , mono-traversable, mtl, parsec, process, random, setenv, shelly + , split, stm, strict, system-argv0, system-filepath, tar, text + , transformers, unix, unordered-containers, utf8-string, uuid + , vector }: mkDerivation { pname = "ihaskell"; - version = "0.5.0.0"; - sha256 = "1vp31ihl2hbpw3fadwmdm6hg1692khmb1v7gzcqik162i65dyzrj"; + version = "0.6.0.0"; + sha256 = "15fsan1dxlmd7y31630rqrg9gaa205g3s89vlqnxjv0dfvs86qf0"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random shelly split stm strict system-argv0 - system-filepath tar template-haskell text transformers unix - unordered-containers utf8-string uuid vector + system-filepath tar text transformers unix unordered-containers + utf8-string uuid vector ]; testDepends = [ - aeson base base64-bytestring bytestring cereal classy-prelude - cmdargs containers directory filepath ghc ghc-parser ghc-paths - haskeline haskell-src-exts here hlint hspec http-client + aeson base base64-bytestring bin-package-db bytestring cereal + classy-prelude cmdargs containers directory filepath ghc ghc-parser + ghc-paths haskeline haskell-src-exts here hlint hspec http-client http-client-tls HUnit ipython-kernel MissingH mono-traversable mtl parsec process random setenv shelly split stm strict system-argv0 system-filepath tar text transformers unix unordered-containers @@ -69689,13 +70545,12 @@ self: { }: mkDerivation { pname = "ihaskell-rlangqq"; - version = "0.2.0.0"; - sha256 = "18681acd0wmmbalj87p4psis1qf84rzhvh8c1a96jgh5nv3rk5dn"; + version = "0.2.0.1"; + sha256 = "1si38n47p57kwqsmsqw9bnv4k6z3zd6n8f5kmsmmbcmjdqmi7i86"; buildDepends = [ base base64-bytestring blaze-html bytestring directory filepath ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat ]; - jailbreak = true; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -69745,6 +70600,7 @@ self: { mkDerivation { pname = "image-type"; version = "0.1.0.0"; + revision = "1"; sha256 = "0xr55c5g4jn1y83qy7bqa5ww9r73vw9clgln9ld893vypmb91wks"; editedCabalFile = "47033c893690f2cea85ba867343f277a8e2594f9010a5466a39dc7f3c4d682f2"; buildDepends = [ base bytestring ]; @@ -69774,6 +70630,7 @@ self: { mkDerivation { pname = "imagemagick"; version = "0.0.3.5"; + revision = "1"; sha256 = "0vwmx86wpxr1f5jrwlqpvrb94dbrm0jjdqq6bppfnfyppd3s1mmq"; editedCabalFile = "9666a02ba8aef32515f97734c86453b3b9759c46c6a9306be9f20dbdb6b98203"; isLibrary = true; @@ -69816,15 +70673,16 @@ self: { }) {}; "imagesize-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , resourcet + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , exceptions, hspec, resourcet }: mkDerivation { pname = "imagesize-conduit"; - version = "1.0.0.4"; - sha256 = "0hhmjbdqdljfy3khzpg2xq6kgxa9x89jvpci7lf413pc1lpg4cw7"; - editedCabalFile = "9a9a6ea6572ae1cdf6f1df1bbd35c96ae2aac9f61f7eabbcc1a60ed792d14a3d"; - buildDepends = [ base bytestring conduit conduit-extra ]; + version = "1.1"; + sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + buildDepends = [ + base bytestring conduit conduit-extra exceptions + ]; testDepends = [ base bytestring conduit conduit-extra hspec resourcet ]; @@ -70054,12 +70912,12 @@ self: { }) {}; "include-file" = callPackage - ({ mkDerivation, base, bytestring, random, template-haskell }: + ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { pname = "include-file"; - version = "0.1.0.1"; - sha256 = "18rzxhblr77vzhkjyyi85fkbrpy897jm04l97zf39v0bf3v5wskh"; - buildDepends = [ base bytestring random template-haskell ]; + version = "0.1.0.2"; + sha256 = "0yrqvdp37wjw9j7vknzyiw4954yskxh75z8r3sic6qdmz17zv8ba"; + buildDepends = [ base bytestring template-haskell ]; testDepends = [ base bytestring ]; description = "Inclusion of files in executables at compile-time"; license = stdenv.lib.licenses.bsd3; @@ -70137,8 +70995,8 @@ self: { }: mkDerivation { pname = "indentation"; - version = "0.2.1"; - sha256 = "0p6ng30nnkgnfg06bfi0j822wfj1hh04imilmpr1k2n3pjqlqmv0"; + version = "0.2.1.1"; + sha256 = "1wb5kv0wx25hhg08afsqpzkkc8c981pbhp8wrzdclb4105y4l4vj"; buildDepends = [ base mtl parsec parsers trifecta ]; testDepends = [ base parsec tasty tasty-hunit trifecta ]; homepage = "https://bitbucket.org/mdmkolbe/indentation"; @@ -70177,6 +71035,7 @@ self: { mkDerivation { pname = "index-core"; version = "1.0.1"; + revision = "1"; sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4"; editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f"; buildDepends = [ base ]; @@ -70540,25 +71399,27 @@ self: { }: mkDerivation { pname = "int-cast"; - version = "0.1.1.0"; - sha256 = "1snzggbb2z6rczym0xmbfmi59cdyf49qvjbfqchp8sr7b6dgn0vz"; - buildDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb"; + buildDepends = [ base nats ]; testDepends = [ base nats QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; }) {}; - "integer-gmp_0_5_1_0" = callPackage + "integer-gmp_1_0_0_0" = callPackage ({ mkDerivation, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "0.5.1.0"; - sha256 = "04nklslbl336vd73lqfw7mvmlkd2wa19qwq3j14admzk3k5a0j3j"; + version = "1.0.0.0"; + revision = "1"; + sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f"; + editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663"; buildDepends = [ ghc-prim ]; + jailbreak = true; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -71018,6 +71879,7 @@ self: { mkDerivation { pname = "io-throttle"; version = "0.1.0"; + revision = "1"; sha256 = "043plb9n606hkbdjddgk9kg12fzzs7ry063ckiky4zymy2vprcj9"; editedCabalFile = "c3903532515f76e374229ea572d11f7ab02a560062425f33649399c5ac61a16e"; buildDepends = [ base SafeSemaphore threads ]; @@ -71066,8 +71928,8 @@ self: { ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { pname = "ip6addr"; - version = "0.5.0.0"; - sha256 = "1yn68f7d41818mc8m4zpfy66xz8imgfw1mw0wgfwgiapmr0liwvw"; + version = "0.5.0.1"; + sha256 = "08nwzas5r3b47chldc3dmwmwxam5dlmsyqqqmql7rjm87h645di4"; isLibrary = false; isExecutable = true; buildDepends = [ base cmdargs IPv6Addr text ]; @@ -71167,8 +72029,8 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.3.1"; - sha256 = "1l3asv8q1jiwsvpq6kkigrzpm3pjbm03gpc4rbhn6kpi6z9h8cdp"; + version = "1.3.2"; + sha256 = "0zdcpmxyn1acxbdgh0k201ha70yzms1w27s7n6awp67hz7v0n95m"; buildDepends = [ appar base byteorder containers network ]; testDepends = [ appar base byteorder containers doctest hspec network QuickCheck @@ -71227,18 +72089,18 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, tar, text, transformers, unix - , uuid, zeromq4-haskell + , directory, filepath, mtl, parsec, SHA, tar, text, transformers + , unix, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.3.0.0"; - sha256 = "035cfq1dlkjmmfjkmfvkn4i4rx04wzsgz9s4dbdwhkx3x7bcj7sj"; + version = "0.6.0.0"; + sha256 = "0pk49hz2ba2ikd96nymrlk7nrd5sw1fmy7xbx24hrri5izqfjjli"; isLibrary = true; isExecutable = true; buildDepends = [ aeson base bytestring cereal containers directory filepath mtl - parsec tar text transformers unix uuid zeromq4-haskell + parsec SHA tar text transformers unix uuid zeromq4-haskell ]; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; @@ -71315,6 +72177,7 @@ self: { mkDerivation { pname = "irc-ctcp"; version = "0.1.2.1"; + revision = "1"; sha256 = "1bpn9i9mqmhiif6mhw6q9nzy5cwx1x1yh81216gkqc5gi43gsc5s"; editedCabalFile = "23e92ff7cad332b34f89273fe543e9b8b87a19b30fb1a18fad61c9c3952d0dce"; buildDepends = [ base bytestring text ]; @@ -72138,43 +73001,42 @@ self: { }) {}; "jalla" = callPackage - ({ mkDerivation, base, c2hs, cblas, convertible, f77blas, HUnit - , lapack, lapacke, mtl, QuickCheck, random, test-framework + ({ mkDerivation, base, blas, c2hs, cblas, convertible, HUnit + , lapacke, mtl, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "jalla"; - version = "0.1.0.1"; - sha256 = "18nxlfr59ka4z45a5nn47lyqsbzfjsfgg1wm5irmncj1jmasjpq5"; + version = "0.2"; + sha256 = "02n9dfspn648090d3yhk3ngqzjky82ly770qi13d1h13ixbv2lx0"; buildDepends = [ base convertible mtl QuickCheck random ]; testDepends = [ base HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; buildTools = [ c2hs ]; - extraLibraries = [ cblas f77blas lapack lapacke ]; - jailbreak = true; + extraLibraries = [ blas cblas lapacke ]; homepage = "https://github.com/cgo/jalla"; description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE."; - license = stdenv.lib.licenses.bsd3; + license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) { cblas = null; f77blas = null; lapack = null; - lapacke = null;}; + }) { inherit (pkgs) blas; cblas = null; lapacke = null;}; "jammittools" = callPackage - ({ mkDerivation, base, boxes, bytestring, conduit, containers - , directory, filepath, HPDF, JuicyPixels, process, property-list - , temporary, transformers, vector + ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio + , containers, directory, filepath, HPDF, JuicyPixels, process + , property-list, resourcet, temporary, transformers, vector }: mkDerivation { pname = "jammittools"; - version = "0.4"; - sha256 = "1dz03p2449aqf517n03mgydd527lh3pyf9s11a46rwafpwh9wn1d"; + version = "0.4.1"; + sha256 = "0dmnv20nqv72wm42m5widcq0b63rnrslg8ylabc6hqp7xdqa7vil"; isLibrary = true; isExecutable = true; buildDepends = [ - base boxes bytestring conduit containers directory filepath HPDF - JuicyPixels process property-list temporary transformers vector + base boxes bytestring conduit conduit-audio containers directory + filepath HPDF JuicyPixels process property-list resourcet temporary + transformers vector ]; homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; @@ -72361,8 +73223,8 @@ self: { }: mkDerivation { pname = "jmacro"; - version = "0.6.9"; - sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6"; + version = "0.6.11"; + sha256 = "1b45graag0nmadaf1ssaps4g9p7xx7d2h7dy84nzmdhrpvdlw4xs"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -72399,8 +73261,8 @@ self: { }: mkDerivation { pname = "jmacro-rpc-happstack"; - version = "0.3"; - sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa"; + version = "0.3.1"; + sha256 = "0b77nrvrh1wzsp6djji0hkgl6flyl664l7kzbf5kpi30mqh45a6a"; buildDepends = [ aeson base blaze-html bytestring containers happstack-server jmacro jmacro-rpc mtl @@ -72408,7 +73270,6 @@ self: { homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; description = "Happstack backend for jmacro-rpc"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jmacro-rpc-snap" = callPackage @@ -72543,7 +73404,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -72556,8 +73416,8 @@ self: { }: mkDerivation { pname = "jose-jwt"; - version = "0.4.1.1"; - sha256 = "0myldbliixd45h1fklzjn7r4gdw5nsl1swp3h14wdl1lck4zd7fq"; + version = "0.4.2"; + sha256 = "1vz32w4yd5yfk3wcsdicfy3qczwcf9hldx19jwf4ihsfyk4hdpzr"; buildDepends = [ aeson base base64-bytestring byteable bytestring cereal cipher-aes containers crypto-cipher-types crypto-numbers crypto-pubkey @@ -72733,8 +73593,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "0.2.5.9"; - sha256 = "0ajsxg515484bqmg94l9gmg4jpfvv6ykcbnyglkh1j86phggxrf2"; + version = "0.2.5.11"; + sha256 = "00m9i8fnbivqf2hdlq2gk8afdfrbgp2b3likdyz92qnjd1n2jl0y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -72742,7 +73602,6 @@ self: { hflags hint lens mtl pretty process scientific text uniplate unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/mgajda/json-autotype"; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; @@ -72812,6 +73671,7 @@ self: { mkDerivation { pname = "json-extra"; version = "0.1.0.1"; + revision = "1"; sha256 = "1wqn68brkjmix7xidcb7170ydpxwq1p48qqmm4w9ak0zkvm70fks"; editedCabalFile = "76113c3d47cb5d8087ffe18e1b09eaa22cc8dcd07010537739c7f1e4dc6b0741"; buildDepends = [ @@ -72922,18 +73782,18 @@ self: { }) {}; "json-rpc-server" = callPackage - ({ mkDerivation, aeson, base, bytestring, HUnit, mtl + ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl , test-framework, test-framework-hunit, text, unordered-containers , vector }: mkDerivation { pname = "json-rpc-server"; - version = "0.1.4.0"; - sha256 = "1k909cxp63qvbbl916m6bk7i26np4aba2v87imfik134ii4h9pry"; + version = "0.1.5.0"; + sha256 = "1328366gdcsgfwqjzqgz07nnxn2j8gpbrcr6888wq1br0bxyczj5"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring mtl text unordered-containers vector + aeson base bytestring deepseq mtl text unordered-containers vector ]; testDepends = [ aeson base bytestring HUnit mtl test-framework test-framework-hunit @@ -73268,6 +74128,7 @@ self: { mkDerivation { pname = "kan-extensions"; version = "4.2.1"; + revision = "1"; sha256 = "0lymh1njw1zh9is6zk3bmr7jylna28632l4pylh6chlxpjvy4zwl"; editedCabalFile = "c0b1fdbd894c452f2658615bb14db240921b9ba5115f4f232d173ecbdae83ead"; buildDepends = [ @@ -73584,6 +74445,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "keycode" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "keycode"; + version = "0.1"; + sha256 = "1cwj96mzxqagim3bcshzsrm2mxgmm8rrawy6hkvki9l55cggwbpv"; + buildDepends = [ base containers ]; + homepage = "https://github.com/RyanGlScott/keycode"; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "keyring" = callPackage ({ mkDerivation, base, udbus }: mkDerivation { @@ -73801,8 +74674,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "kmeans"; - version = "0.1.2"; - sha256 = "1v9f6yzzb282x30wyk91f68dphxl5g2lnibmsqhvc9m4wznnxjzc"; + version = "0.1.3"; + sha256 = "02rc3bd2cp1fp0fxbzqiy34s5gn38j8hgviilz1584z05jhj97ix"; buildDepends = [ base ]; description = "K-means clustering algorithm"; license = stdenv.lib.licenses.bsd3; @@ -73915,8 +74788,8 @@ self: { }: mkDerivation { pname = "koofr-client"; - version = "1.0.0.2"; - sha256 = "094rhsf910ifzazy3j937hgdkibvwjc5x69yxvglmizc3xl6qqfv"; + version = "1.0.0.3"; + sha256 = "1bz7akd7sssn1gzqfvr0y343771zk7dn1n3as0m93wg4ifpz1dia"; buildDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -73994,8 +74867,8 @@ self: { ({ mkDerivation, base, dlist, transformers }: mkDerivation { pname = "kure"; - version = "2.16.8"; - sha256 = "01168afr5azb74sh6r6blm3fmkcjp8248rkjapk7ya6cqixagmsy"; + version = "2.16.10"; + sha256 = "0xfnrp39w2ip9744898mfd63sbya8an72fx3nwj1s3vzdb1h3lhm"; buildDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -74084,7 +74957,6 @@ self: { homepage = "https://github.com/lucasdicioccio/laborantin-hs"; description = "an experiment management framework"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "labyrinth" = callPackage @@ -74173,15 +75045,14 @@ self: { }: mkDerivation { pname = "laika"; - version = "0.1.1"; - sha256 = "1ifs8brgbhzwl58ccnpyvfrkn1x27a38ylawik382n221sv28pj5"; + version = "0.1.3"; + sha256 = "1j9f76sch91igpgarw7pwzhymd6ji7wnwr9l8riallglphc55g7l"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -74341,8 +75212,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.0"; - sha256 = "022xrcpjxzs7ac4ssaq1xkmjypvql8bpa1mvmgysskg6z0ix7jr9"; + version = "5.0.1"; + sha256 = "1zf29cqdr71n2bj7idh9v7yygk0ckpadr44f5ghqr74zdpyw6dyi"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -74353,7 +75224,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -74366,8 +75236,8 @@ self: { }: mkDerivation { pname = "lambdabot-core"; - version = "5.0"; - sha256 = "0krsz6a7lgclbwnjy3581lqzcb3y6gf8fav6n7ka5683mp281xa5"; + version = "5.0.1"; + sha256 = "06asm62k2nb32yr0z4sw70z0r4ikakgkph6zqhjw7wj14ic2nxbk"; buildDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -74376,7 +75246,6 @@ self: { template-haskell time transformers transformers-base unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; @@ -74393,8 +75262,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.0"; - sha256 = "1ls34bqyqxf89dgfcn1frsz6bdxy10dbyk7f7c9lndks8sv8hlvr"; + version = "5.0.1"; + sha256 = "0bzfbaksij0sav93qp2j4k4qlclb9zdz8z8233ziismf9bq4bm16"; buildDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts hoogle HTTP IOSpec @@ -74415,8 +75284,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.0"; - sha256 = "0d0pm06912rc4xwmqrwcwyfnzwmazqc0sdp58nqdpzk4wg5f3lx2"; + version = "5.0.1"; + sha256 = "13ybjyx5x84g0w7l2yyni5yary59j4kpaqc4pl1942bp6y7lbfrp"; buildDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -74428,23 +75297,22 @@ self: { "lambdabot-misc-plugins" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hstatsd - , lambdabot-core, lifted-base, monad-control, mtl, network - , network-uri, parsec, process, random, random-fu, random-source - , regex-tdfa, SafeSemaphore, split, tagsoup, template-haskell, time + , lambdabot-core, lifted-base, mtl, network, network-uri, parsec + , process, random, random-fu, random-source, regex-tdfa + , SafeSemaphore, split, tagsoup, template-haskell, time , transformers, transformers-base, unix, utf8-string, zlib }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.0"; - sha256 = "0i9ax50vxfj312kw8lgxdnqsiriip2ls6zaq3c7ll4f1x6cb634r"; + version = "5.0.1"; + sha256 = "08dhwls7lgwrpyqzjxpg95cn80mqf3izrwnzbmygkp3my8xqxakp"; buildDepends = [ base bytestring containers filepath hstatsd lambdabot-core - lifted-base monad-control mtl network network-uri parsec process - random random-fu random-source regex-tdfa SafeSemaphore split - tagsoup template-haskell time transformers transformers-base unix + lifted-base mtl network network-uri parsec process random random-fu + random-source regex-tdfa SafeSemaphore split tagsoup + template-haskell time transformers transformers-base unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; @@ -74457,8 +75325,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.0"; - sha256 = "0nsagim2jzpap2ja7661qycvy0nqrnjq6hx6d8zvisql7g70yji0"; + version = "5.0.1"; + sha256 = "1h9qnxbdqnpwarbvviaqrl18fxd9bs33f6n60b7cdx1p2imzbp25"; buildDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -74475,8 +75343,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.0"; - sha256 = "017zw98mw3mcrxgl489zyfjq605m07wkjs5kcwcjf7071vh358c7"; + version = "5.0.1"; + sha256 = "11hljsbb8kdbf6h4si97c52643w2fxicql1xq743f4gkys2y0x2a"; buildDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -74492,8 +75360,8 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.0"; - sha256 = "0c5p8pxng6nwn252mi92yrwq67pdrykjmpkkbvw9ajwhg8v5nf08"; + version = "5.0.1"; + sha256 = "0ylp40j54whn4fsgxi0843mvs0gx286c5fm127ja1h7j6c74svkc"; buildDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; @@ -74506,8 +75374,8 @@ self: { ({ mkDerivation, base, oeis, QuickCheck }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.0"; - sha256 = "09cz4vr4pxsa25ms336ic80lsqm4d5lrfvra194h5h2hddvhdk5q"; + version = "5.0.1"; + sha256 = "1ijpr8b4vzvyfbry1g8wphk9wn7pxvay2wk6racl5k78kw27jd1c"; buildDepends = [ base oeis QuickCheck ]; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot trusted code"; @@ -74884,13 +75752,14 @@ self: { }: mkDerivation { pname = "language-c-inline"; - version = "0.7.8.0"; - sha256 = "0kzhprxw2lhk5s66nh7q2rfndjlch1ii7m3bn116dym4dc16b0cm"; + version = "0.7.9.1"; + sha256 = "0apxv1mcmglb3m06dchs25sc7bhgz6v4gv098yfb79qmjmsxpc33"; buildDepends = [ array base containers filepath language-c-quote mainland-pretty template-haskell ]; testDepends = [ base language-c-quote ]; + jailbreak = true; homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; @@ -74915,6 +75784,7 @@ self: { base HUnit srcloc symbol test-framework test-framework-hunit ]; buildTools = [ alex happy ]; + jailbreak = true; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; @@ -74966,6 +75836,7 @@ self: { mkDerivation { pname = "language-ecmascript"; version = "0.17"; + revision = "2"; sha256 = "15v0nwp97058yjn0sp0hlsk7pvs6vaak3521p99f0z7a1dx4d876"; editedCabalFile = "834526a1a67668bc7689b50d0ff28b674235724d5b3df5ce8cccbcd5fd4f5622"; buildDepends = [ @@ -75164,8 +76035,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.6.3.1"; - sha256 = "11q59pbl7bjx4x8xn07lq09a235l1sgw510s9lb89q35mm0mravi"; + version = "0.6.3.2"; + sha256 = "0wnmybaqiwwxg8xcs7g1ffsmv8kmld7m6s0a8wp0lvhdil7d9xq6"; buildDepends = [ array base deepseq mtl parsec safe ]; testDepends = [ base deepseq directory filepath parsec QuickCheck tasty tasty-hunit @@ -75175,7 +76046,6 @@ self: { homepage = "http://github.com/osa1/language-lua"; description = "Lua parser and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-mixal" = callPackage @@ -75273,6 +76143,7 @@ self: { ansi-wl-pprint base Glob hspec HUnit lens parsec parsers strict-base-types temporary text unix unordered-containers vector ]; + jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -75512,7 +76383,6 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "High and low-level interface to the Novation Launchpad midi controller"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lax" = callPackage @@ -75653,8 +76523,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "lazysplines"; - version = "0.1"; - sha256 = "08zpr5bsqgfk3f5v8133zgdprl22n09l60b31xzadcdy50zmnif1"; + version = "0.2"; + sha256 = "0r6z3b6yaxsnz8cbfr815q97jlzsjrqszb2vvzwjyqbh6qqw006y"; buildDepends = [ base ]; description = "Differential solving with lazy splines"; license = stdenv.lib.licenses.bsd3; @@ -75817,7 +76687,6 @@ self: { jailbreak = true; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "learn-physics-examples" = callPackage @@ -75845,8 +76714,8 @@ self: { }: mkDerivation { pname = "learning-hmm"; - version = "0.3.2.0"; - sha256 = "1jlrp04hyzxz8bza2wj35v098b6casfa0byswvnchphgnpz1bn42"; + version = "0.3.2.1"; + sha256 = "1nk5dcz6h27d6y5lq4sgl9vn6dl9cmwrkfghxx33nbfq5p77vkyb"; buildDepends = [ base containers deepseq hmatrix random-fu random-source vector ]; @@ -75913,8 +76782,8 @@ self: { , binary-shared, bytestring, Cabal, conduit, conduit-extra , containers, deepseq, directory, executable-path, filepath, ghc , haddock-api, hslogger, HTTP, HUnit, ltk, network, network-uri - , parsec, pretty, process, process-leksah, resourcet, strict, text - , time, transformers, unix + , parsec, pretty, process, resourcet, strict, text, time + , transformers, unix }: mkDerivation { pname = "leksah-server"; @@ -75926,17 +76795,53 @@ self: { attoparsec attoparsec-conduit base binary binary-shared bytestring Cabal conduit conduit-extra containers deepseq directory executable-path filepath ghc haddock-api hslogger HTTP ltk network - network-uri parsec pretty process process-leksah resourcet strict - text time transformers unix + network-uri parsec pretty process resourcet strict text time + transformers unix ]; testDepends = [ base conduit conduit-extra hslogger HUnit process resourcet transformers ]; + jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "lens_4_7" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, comonad + , containers, contravariant, deepseq, directory, distributive + , doctest, exceptions, filepath, free, generic-deriving, ghc-prim + , hashable, hlint, HUnit, mtl, nats, parallel, primitive + , profunctors, QuickCheck, reflection, semigroupoids, semigroups + , simple-reflect, split, tagged, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, text, transformers, transformers-compat + , unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.7"; + revision = "5"; + sha256 = "1z2ydc90m0cq76yamdaws4677lpi476f9z25xrz8r7y5kxh2aq4s"; + editedCabalFile = "bbf436c8c154dc8020aaa23d19e49bbde356447c9ca2e4112baf2ad5d23d7cb1"; + buildDepends = [ + array base bifunctors bytestring comonad containers contravariant + distributive exceptions filepath free ghc-prim hashable mtl + parallel primitive profunctors reflection semigroupoids semigroups + split tagged template-haskell text transformers transformers-compat + unordered-containers vector void + ]; + testDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect split test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd3; }) {}; "lens" = callPackage @@ -75953,6 +76858,7 @@ self: { mkDerivation { pname = "lens"; version = "4.8"; + revision = "1"; sha256 = "1h39cbw25aynz7kzx55i3rcz4p2mi0907ri6g78xbk2r3wf0qbnr"; editedCabalFile = "50c7ea763fd0273f84d02acdf9cdc2b497deb83d595a231ce3c663f877bd8d33"; buildDepends = [ @@ -76075,7 +76981,6 @@ self: { homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-sop" = callPackage @@ -76153,13 +77058,13 @@ self: { "leveldb-haskell" = callPackage ({ mkDerivation, async, base, bytestring, data-default, directory - , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, snappy - , tasty, tasty-quickcheck, temporary, transformers + , exceptions, filepath, leveldb, mtl, QuickCheck, resourcet, tasty + , tasty-quickcheck, temporary, transformers }: mkDerivation { pname = "leveldb-haskell"; - version = "0.6.1"; - sha256 = "1pc6fzjac4dxk0rspvb4ifiinx4da1ms37mwm6vc05140r0hqvbw"; + version = "0.6.2"; + sha256 = "0gx9rn5vbmy5nq1n2ga1v5v7b7p11d0rxhdh75pz4dqgazxyjlax"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -76170,12 +77075,11 @@ self: { base bytestring data-default directory exceptions mtl QuickCheck tasty tasty-quickcheck temporary transformers ]; - extraLibraries = [ leveldb snappy ]; - jailbreak = true; + extraLibraries = [ leveldb ]; homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) leveldb; inherit (pkgs) snappy;}; + }) { inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage ({ mkDerivation, async, base, bytestring, data-default, filepath @@ -76364,14 +77268,14 @@ self: { }) {}; "lhs2html" = callPackage - ({ mkDerivation, base, directory, filepath, Glob, nicify }: + ({ mkDerivation, base, directory, filepath, Glob }: mkDerivation { pname = "lhs2html"; - version = "0.99999"; - sha256 = "1znqqgbg64r790c74ggzdffkgw9i8xg86wf9pk029q02fw67b7nb"; + version = "0.999999"; + sha256 = "1cwvpn6cl0d5rs5x6q3c2pw4l4hpxz20sr717mggafzsj6j7cccv"; isLibrary = false; isExecutable = true; - buildDepends = [ base directory filepath Glob nicify ]; + buildDepends = [ base directory filepath Glob ]; description = "Compile lhs in bird style to md, html, hs"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -76551,8 +77455,8 @@ self: { }: mkDerivation { pname = "libjenkins"; - version = "0.8.0"; - sha256 = "0dndz0ja6h50ix5r93ln2s5n7ymjariflxi0g7pfy850gyyimv27"; + version = "0.8.1"; + sha256 = "00h4wzzs6b3s9cv4bw2slj3c0ckb6p8gph7wzx8cgrxjyjqqx85z"; buildDepends = [ async attoparsec base bytestring conduit containers free http-client http-conduit http-types monad-control mtl network @@ -76675,7 +77579,6 @@ self: { homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm"; description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) { nvvm = null;}; "liboleg" = callPackage @@ -76846,7 +77749,6 @@ self: { homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home"; description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) taglib;}; "libvirt-hs" = callPackage @@ -76955,8 +77857,8 @@ self: { }: mkDerivation { pname = "lifted-async"; - version = "0.6.0.1"; - sha256 = "12qbibsl26njx6m1dq12gqfb15rkyag23c1vkcinlk301a0cvsmf"; + version = "0.7.0"; + sha256 = "1i9wm7pz8mh0gjyp7jhf3as82yi1axskv1mp5596gq7pszgglyd6"; buildDepends = [ async base constraints lifted-base monad-control transformers-base ]; @@ -77231,12 +78133,11 @@ self: { }: mkDerivation { pname = "linear-opengl"; - version = "0.2.0.6"; - sha256 = "1yb6c0r10d44pyahhzgyajphgyhmr9hs402633k6ynm3f1jdwyyg"; + version = "0.2.0.7"; + sha256 = "0yj98757d6z1bh3mqajn58ax2iaxnf2nl68wvbjv2pncwfn679m6"; buildDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; - jailbreak = true; homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; @@ -77651,8 +78552,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.2.3.1"; - sha256 = "0gjndhrd0cjwmvl2ligklvmqr64p50m42rvxb79i13jk2jb16pg5"; + version = "0.2.3.2"; + sha256 = "0gm2cy4a1l6kh65cwj3ssv9r9ry4nk2sjr3cqhkp5i7mhmpc6q58"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -77808,9 +78709,8 @@ self: { ({ mkDerivation, base, binary, containers, dlist }: mkDerivation { pname = "list-tries"; - version = "0.5.2"; - sha256 = "0lfl35i1k3nnv8q6bhwq4sr197fylin2hmxa4b96kfcc22xfzwy6"; - editedCabalFile = "50826a589644da396825e57f778b8e5596df986e1cf8ca97d946d29243b0556e"; + version = "0.6.0"; + sha256 = "0raf2rdfq2kn7sif3czihj0mpgjrp63x0vf7wisb6hl9ipzn9x4s"; isLibrary = true; isExecutable = true; buildDepends = [ base binary containers dlist ]; @@ -77872,7 +78772,6 @@ self: { base blaze-html blaze-markup cheapskate directory filepath highlighting-kate parsec text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/cdosborn/lit"; description = "A simple tool for literate programming"; license = "GPL"; @@ -77979,7 +78878,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "Bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-analysis" = callPackage @@ -78021,8 +78919,7 @@ self: { homepage = "https://github.com/bos/llvm"; description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "llvm-base-types" = callPackage ({ mkDerivation, base, c2hs, containers, deepseq, dwarf, failure @@ -78053,7 +78950,6 @@ self: { homepage = "https://github.com/bos/llvm"; description = "Utilities for bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-data-interop" = callPackage @@ -78094,7 +78990,6 @@ self: { homepage = "http://code.haskell.org/~thielema/llvm-extra/"; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-general" = callPackage @@ -78106,8 +79001,8 @@ self: { }: mkDerivation { pname = "llvm-general"; - version = "3.4.5.0"; - sha256 = "19rvpy7hfgkfjkijnasajrvzbw75ij7sfwg9z4w080x6w39rgppr"; + version = "3.4.5.1"; + sha256 = "13fnr4dpflbfywmdq1r7fxv16lcywwv4a300j8z59xclcskvpajr"; buildDepends = [ array base bytestring containers llvm-general-pure mtl parsec setenv template-haskell transformers transformers-compat @@ -78132,8 +79027,8 @@ self: { }: mkDerivation { pname = "llvm-general-pure"; - version = "3.4.5.0"; - sha256 = "0gb06b8bb5d7fmkjpbi3smjssjxk5xgmf3lv5axhm0rbndi6y9vc"; + version = "3.4.5.1"; + sha256 = "0j08pff3lrzbxpfz73ywxh27ps79c875qvp49swjm14zc6kbsyvy"; buildDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -78257,7 +79152,6 @@ self: { jailbreak = true; description = "Bindings to the LLVM compiler toolkit using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "llvm-tools" = callPackage @@ -78365,7 +79259,6 @@ self: { ]; description = "Human exchangable identifiers and locators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loch" = callPackage @@ -78500,8 +79393,8 @@ self: { ({ mkDerivation, array, base }: mkDerivation { pname = "logfloat"; - version = "0.13.1"; - sha256 = "16k94khzs46wsbbmhla1dnviv97k584ajagbd27arcbr7sdlk7n8"; + version = "0.13.3"; + sha256 = "0m1d0g14p6yb4g4irhisfchx3241b2vlm4g527rhwpr8lxd3fqzp"; buildDepends = [ array base ]; homepage = "http://code.haskell.org/~wren/"; description = "Log-domain floating point numbers"; @@ -78660,6 +79553,7 @@ self: { mkDerivation { pname = "lojban"; version = "0.3"; + revision = "1"; sha256 = "0pd31g21db8yh1mrnmy7r60lr0dbpwlxpwc0hli3y1wcr4fisnx6"; editedCabalFile = "9d30c9c8f1aa80aea24ca606d74ee1b3a9af0ecde15a0e65b1150d483d6b1cfc"; isLibrary = true; @@ -79234,6 +80128,7 @@ self: { mkDerivation { pname = "lvish"; version = "1.1.4"; + revision = "1"; sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44"; editedCabalFile = "38b0af7bd2ebc54b5a2b01a2c24a3832d80f76596c8a8fad621499996ce76e76"; buildDepends = [ @@ -79422,6 +80317,7 @@ self: { mkDerivation { pname = "machines"; version = "0.4.1"; + revision = "1"; sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; editedCabalFile = "6c00ca655eed187aefe091a7dbfb49c08fc0bf89f7c75f11c0a0dfcae9296df8"; buildDepends = [ @@ -79479,6 +80375,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "machines-zlib" = callPackage + ({ mkDerivation, base, basic-prelude, machines, streaming-commons + }: + mkDerivation { + pname = "machines-zlib"; + version = "0.1.0"; + sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d"; + buildDepends = [ base basic-prelude machines streaming-commons ]; + homepage = "https://github.com/lshift/machines-zlib"; + description = "Decompression support for machines"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "macho" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -79684,10 +80593,10 @@ self: { ({ mkDerivation, base, containers, srcloc, text }: mkDerivation { pname = "mainland-pretty"; - version = "0.2.7.1"; - sha256 = "1ac7rig4hc7i3qv7j45442j0d7zhvlwg41a14wykr3fsi8vb1n5m"; + version = "0.2.7.2"; + sha256 = "0spn95apa05bx2akcl13kmg0vlyyakca3jx1960ja4z9dm9lwadd"; buildDepends = [ base containers srcloc text ]; - homepage = "http://www.eecs.harvard.edu/~mainland/"; + homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Pretty printing designed for printing source code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -79829,7 +80738,6 @@ self: { ]; description = "Virtual package to install all Manatee packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee-anything" = callPackage @@ -80007,7 +80915,6 @@ self: { jailbreak = true; description = "IRC client extension for Manatee"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee-mplayer" = callPackage @@ -80515,6 +81422,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "marquise" = callPackage + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , containers, cryptohash, data-binary-ieee754, directory, either + , errors, fast-logger, filepath, hashable, hslogger, hspec + , lifted-async, mmorph, monad-control, monad-logger, mtl + , old-locale, optparse-applicative, packer, pipes, pipes-attoparsec + , pipes-bytestring, pipes-group, semigroups, siphash, text, time + , transformers, transformers-base, unix, unordered-containers + , vaultaire-common, zeromq4-haskell + }: + mkDerivation { + pname = "marquise"; + version = "4.0.0"; + sha256 = "1w2lvns840hdzyismdwv70s70qd2af2ms14y58nhp24yf6h58j7b"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async attoparsec base binary bytestring containers cryptohash + data-binary-ieee754 directory either errors fast-logger filepath + hashable hslogger lifted-async mmorph monad-control monad-logger + mtl old-locale optparse-applicative packer pipes pipes-attoparsec + pipes-bytestring pipes-group semigroups siphash text time + transformers transformers-base unix unordered-containers + vaultaire-common zeromq4-haskell + ]; + testDepends = [ base bytestring hspec ]; + description = "Client library for Vaultaire"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "marxup" = callPackage ({ mkDerivation, base, configurator, containers, cubicbezier , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens @@ -80702,8 +81639,8 @@ self: { }: mkDerivation { pname = "matrix"; - version = "0.3.4.2"; - sha256 = "0i45k524z4hf43dab9dgis3ggcswjm0chlxqfc2rqh581gx85sgm"; + version = "0.3.4.3"; + sha256 = "1nshgxiza384xh7h22qgbwa75bylc1l3gh6dsm51axapr1ldi8gg"; buildDepends = [ base deepseq loop primitive vector ]; testDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A native implementation of matrix operations"; @@ -80797,8 +81734,8 @@ self: { ({ mkDerivation, base, containers, vector }: mkDerivation { pname = "maximal-cliques"; - version = "0.1"; - sha256 = "1kjmjsvxf35sapqq7vhiyd5fc73wj1c0l11hvc41x7pkw87qm83v"; + version = "0.1.1"; + sha256 = "1sbmykgb5lrd32rih09d8d0r5isz4nh5slfyd93dgln7ag3hb7bh"; buildDepends = [ base containers vector ]; description = "Enumerate all maximal cliques of a graph"; license = stdenv.lib.licenses.bsd3; @@ -81142,7 +82079,9 @@ self: { mkDerivation { pname = "memcached-binary"; version = "0.2.0"; + revision = "2"; sha256 = "137vb065f744jq3avpraqryzspch78vc5krp0fw2zzcbk5cm92ad"; + editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530"; buildDepends = [ base bytestring data-default-class network resource-pool storable-endian time unordered-containers @@ -81150,7 +82089,6 @@ self: { testDepends = [ base bytestring data-default-class hspec HUnit network process ]; - jailbreak = true; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; @@ -81161,6 +82099,7 @@ self: { mkDerivation { pname = "memexml"; version = "0.0.2"; + revision = "1"; sha256 = "07cmjx10wbpfcblnd23rzdkma04nyjcpd1g58gp0phajj6xj4i7a"; editedCabalFile = "a1712ea7643a27f1fb40a771fdae76282818b5d317fe8da6a22e705b06bc3b3e"; buildDepends = [ base hxt ]; @@ -81188,8 +82127,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "memoize"; - version = "0.6"; - sha256 = "15ya80la5azkpdnlnd7n6x1z9z2nixg0rakp1bj4xsk1ad1hn6x7"; + version = "0.7"; + sha256 = "1sqi9n9r2q3sh00isgj3rmayrlm970a2g9x389rlfb0kczixdnq4"; buildDepends = [ base template-haskell ]; description = "A memoization library"; license = stdenv.lib.licenses.bsd3; @@ -81423,8 +82362,8 @@ self: { ({ mkDerivation, base, containers, lens, mtl, template-haskell }: mkDerivation { pname = "mgeneric"; - version = "0.0.0.0"; - sha256 = "0fmh2dzwljpifgnjxa177p0lyzhzmsl0hws40rzdr351j9ys51xk"; + version = "0.0.0.2"; + sha256 = "1pgmgssysl0nv9z4vvlmxjijl6y7jvy1b7ph30jnj3fmcrwdf6w3"; buildDepends = [ base containers lens mtl template-haskell ]; homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/"; description = "Generics with multiple parameters"; @@ -81603,8 +82542,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.2.4"; - sha256 = "0s150iwzvx1y1yfli9187lr23l3q0bxah48n27v2k0vvl0jsr69v"; + version = "3.2.5"; + sha256 = "1f1zjp956k0xs1wyckk216i71mmr17ffl66d4y1cmfxm0wrcdnh8"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -81702,8 +82641,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.8.1"; - sha256 = "01das7dv5xrvbbmhz2jkd8s3nbp93vz89dnliz3q04aqc5wvdbh5"; + version = "0.4.8.2"; + sha256 = "19f2q4x8b19sc7y1yyxvl3fsyggjs07yhf1zjw42a875lp4mnvia"; buildDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -81832,6 +82771,7 @@ self: { mkDerivation { pname = "minimal-configuration"; version = "0.1.1"; + revision = "1"; sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43"; editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80"; buildDepends = [ base containers directory filepath tconfig ]; @@ -81845,13 +82785,13 @@ self: { }: mkDerivation { pname = "minimorph"; - version = "0.1.5.0"; - sha256 = "00dnvv0pap2xr74xwzldz89783iw320z7p1rdw0lwjjpbqa3v00g"; + version = "0.1.6.0"; + sha256 = "17ds0bjpyz7ngsq7nnlqix6yjfr6clr7xkwgpg4fysii7qvymbkz"; buildDepends = [ base text ]; testDepends = [ base HUnit test-framework test-framework-hunit text ]; - homepage = "http://darcsden.com/kowey/minimorph"; + homepage = "https://github.com/Mikolaj/minimorph"; description = "English spelling functions with an emphasis on simplicity"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -82461,6 +83401,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monad-classes" = callPackage + ({ mkDerivation, base, conduit, data-lens-light, ghc-prim, mmorph + , monad-control, peano, reflection, tasty, tasty-hunit + , transformers, transformers-base, transformers-compat + }: + mkDerivation { + pname = "monad-classes"; + version = "0.3.1.1"; + sha256 = "1n0ry7lq0vh9siaqxfdfavg67a99zmws5nvr1hjq8k212v36v40c"; + buildDepends = [ + base ghc-prim mmorph monad-control peano reflection transformers + transformers-base transformers-compat + ]; + testDepends = [ + base conduit data-lens-light ghc-prim mmorph tasty tasty-hunit + transformers + ]; + homepage = "https://github.com/strake/monad-classes.hs"; + description = "more flexible mtl"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-codec" = callPackage ({ mkDerivation, base, binary, containers, data-lens, mtl }: mkDerivation { @@ -82629,21 +83591,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger-json" = callPackage + ({ mkDerivation, aeson, base, monad-logger, template-haskell, text + }: + mkDerivation { + pname = "monad-logger-json"; + version = "0.1.0.0"; + sha256 = "1ap98487lwgvgrrxkjskga86ckbv6rhn2n6pzp403343xx51r1qh"; + buildDepends = [ aeson base monad-logger template-haskell text ]; + homepage = "http://github.com/fpco/monad-logger-json"; + description = "JSON-friendly Logging APIs"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog - , monad-logger, shelly, text, transformers + , monad-logger, text, transformers }: mkDerivation { pname = "monad-logger-syslog"; - version = "0.1.0.0"; - sha256 = "0q0m611nr20nxm4wj9ywgq3qakl3qvd820vld4nqxdp1lqsilcwz"; + version = "0.1.1.1"; + sha256 = "0hdm495knrdrl76xlsdp0sk6n0v6qnl9b6r6x9ac6s1p7j1w66vf"; buildDepends = [ base bytestring fast-logger hsyslog monad-logger text transformers ]; - testDepends = [ base monad-logger shelly ]; - jailbreak = true; - homepage = "https://github.com/docmunch/monad-logger-rsyslog"; - description = "rsyslog output for monad-logger"; + homepage = "https://github.com/fpco/monad-logger-syslog"; + description = "syslog output for monad-logger"; license = stdenv.lib.licenses.mit; }) {}; @@ -82678,6 +83651,7 @@ self: { mkDerivation { pname = "monad-lrs"; version = "0.0.2.1"; + revision = "1"; sha256 = "01i8hz50r3lf8r3rasl96blr6br3p1x6hvckhbi8aw61x507jmcg"; editedCabalFile = "dd714797826911e564a0e418307530fa99a8ba9ea91400517be2bb78b4e695c1"; buildDepends = [ base containers ]; @@ -82724,6 +83698,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-open" = callPackage + ({ mkDerivation, base, exceptions, mtl, transformers }: + mkDerivation { + pname = "monad-open"; + version = "0.1.0.0"; + sha256 = "18h24zdvbffnwr2xh4qahakr80z8ly65pmksmk3ngjykxrvif2vx"; + buildDepends = [ base exceptions mtl transformers ]; + jailbreak = true; + description = "Open recursion for when you need it"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-ox" = callPackage ({ mkDerivation, base, containers, mtl, text, vector }: mkDerivation { @@ -82823,6 +83810,7 @@ self: { mkDerivation { pname = "monad-peel"; version = "0.1.1"; + revision = "1"; sha256 = "0n3cxa94wd3hjvy9jgf3d8p7qfb9jaaf29simjya7rlcb673pg3l"; editedCabalFile = "64e1f99ea3e8c36d5d4e86794d1fc02966e7036b43ae4e1dcf01ade192962611"; buildDepends = [ base extensible-exceptions transformers ]; @@ -82882,6 +83870,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-skeleton" = callPackage + ({ mkDerivation, base, containers, ghc-prim }: + mkDerivation { + pname = "monad-skeleton"; + version = "0"; + sha256 = "0niv5pd3n87d1yqn13sam2qsha0dnnkclvn7wxha5zk66km56zyq"; + buildDepends = [ base containers ghc-prim ]; + homepage = "https://github.com/fumieval/monad-skeleton"; + description = "An undead monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monad-st" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { @@ -83356,22 +84356,22 @@ self: { "mono-traversable" = callPackage ({ mkDerivation, base, bytestring, comonad, containers, dlist - , dlist-instances, foldl, hashable, hspec, QuickCheck + , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck , semigroupoids, semigroups, text, transformers , unordered-containers, vector, vector-algorithms, vector-instances }: mkDerivation { pname = "mono-traversable"; - version = "0.9.0.1"; - sha256 = "1wcl2cv16855kg9kn3cz3947jzcb3g2n3mqnhkp0spd42ya3jw83"; + version = "0.9.1"; + sha256 = "0hzqlldilkkfmrq3pkymwkzpp9dn40v6fa18kahxlf4qiyih0xzc"; buildDepends = [ base bytestring comonad containers dlist dlist-instances hashable semigroupoids semigroups text transformers unordered-containers vector vector-algorithms vector-instances ]; testDepends = [ - base bytestring containers foldl hspec QuickCheck semigroups text - transformers unordered-containers vector + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector ]; homepage = "https://github.com/snoyberg/mono-traversable"; description = "Type classes for mapping, folding, and traversing monomorphic containers"; @@ -83459,12 +84459,11 @@ self: { }: mkDerivation { pname = "monoidal-containers"; - version = "0.1.2.0"; - sha256 = "0d94hpgkrh61cax0f4p71irgvq3psn53qiy7x9bwql8qwsdni1qg"; + version = "0.1.2.1"; + sha256 = "1n76vjh785yzirfkh63nlrpi9y1bb9z1r3v514150wfxjn3n723j"; buildDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; - jailbreak = true; homepage = "http://github.com/bgamari/monoidal-containers"; description = "Containers with monoidal accumulation"; license = stdenv.lib.licenses.bsd3; @@ -83646,8 +84645,8 @@ self: { }: mkDerivation { pname = "morte"; - version = "1.1.1"; - sha256 = "0daq0894kmd938k7qdbi7f1axih5gx5yrimx5pssfvhvw78bdqp4"; + version = "1.1.2"; + sha256 = "1rz15nmzagwngjd15kd25vnrpz3br23kmjzf558qp61bxlhflybc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -83681,7 +84680,9 @@ self: { mkDerivation { pname = "mp"; version = "0.2.2"; + revision = "1"; sha256 = "1klz2ykglgkvxs66j5iacjbx5cv5gq0y4d12g68ng2pcmpwc93ir"; + editedCabalFile = "8c578611352448e5aea9a082fb0696e7bb890397214631a009351925db2f88b1"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -83690,7 +84691,7 @@ self: { unordered-containers utf8-string vty vty-ui ]; jailbreak = true; - homepage = "http://code.google.com/p/linux-music-player"; + homepage = "https://bitbucket.org/borekpiotr/linux-music-player"; description = "Music player for linux"; license = "GPL"; }) {}; @@ -83819,6 +84820,7 @@ self: { mkDerivation { pname = "mqtt-hs"; version = "0.2.0"; + revision = "1"; sha256 = "0jvzr6qbmdxl11j8fwnbasgqgdfm395lm2gh2va9zfpk5xpx0mjg"; editedCabalFile = "aa0a2e9ea99cfbed4646ac02625b66361f8175ae2d70efc041dc517119706439"; buildDepends = [ @@ -84164,17 +85166,17 @@ self: { }) {}; "multiarg" = callPackage - ({ mkDerivation, barecheck, base, QuickCheck, quickpull - , utf8-string + ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck + , tasty-th, utf8-string }: mkDerivation { pname = "multiarg"; - version = "0.30.0.4"; - sha256 = "0bnzlz5na6fbw870vmvxd4jr71fdkdkxs7dd820p772b1pzfg1g5"; + version = "0.30.0.8"; + sha256 = "18lq0q76a4vx5r28wrxwa3cb2gdx6hv8vylkky07dqccqgxdg5ss"; isLibrary = true; isExecutable = true; buildDepends = [ base utf8-string ]; - testDepends = [ barecheck base QuickCheck quickpull ]; + testDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ]; homepage = "https://github.com/massysett/multiarg"; description = "Command lines for options that take multiple arguments"; license = stdenv.lib.licenses.bsd3; @@ -84767,8 +85769,8 @@ self: { }: mkDerivation { pname = "mutable-containers"; - version = "0.2.1.2"; - sha256 = "1j1dzx8iniq3arpjrndkpvkjad175hl4ijjryaf3s59pzpbz17y8"; + version = "0.3.0"; + sha256 = "1xsz214z5z1qrl5xy5gyq97bsh8b1li3kaz7cp6zm955bz43rv6c"; buildDepends = [ base containers ghc-prim mono-traversable primitive vector ]; @@ -84873,8 +85875,8 @@ self: { }: mkDerivation { pname = "mwc-random"; - version = "0.13.3.0"; - sha256 = "0navzgw1y1zm3n4zs7x0lk2nmnjysk5cpw0clpl0w7iwb75yrnjd"; + version = "0.13.3.2"; + sha256 = "01jqmq52knlwskgyx7940c81dmgdivrj0sbi2h6l0ccbxiaf7c9c"; buildDepends = [ base primitive time vector ]; testDepends = [ base HUnit QuickCheck statistics test-framework @@ -84909,6 +85911,7 @@ self: { mkDerivation { pname = "myTestlll"; version = "1.0.0"; + revision = "4"; sha256 = "1rd3pxc20xwb3j0q9ckygy59mks8p38vzmi4wfg8zp1dq92jmhy0"; editedCabalFile = "e554b67c3f8efd73e028328341e3b535dc4898b3d476524a40c236c4c2871e43"; buildDepends = [ @@ -84979,8 +85982,8 @@ self: { }: mkDerivation { pname = "mysql"; - version = "0.1.1.7"; - sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; + version = "0.1.1.8"; + sha256 = "115xz4khg4klrgjvv9dy83pv197b4y1zgw6fbpv8j88yr3qjmw4h"; buildDepends = [ base bytestring containers ]; buildTools = [ mysql ]; extraLibraries = [ openssl zlib ]; @@ -84996,6 +85999,7 @@ self: { mkDerivation { pname = "mysql-effect"; version = "0.2.0.3"; + revision = "1"; sha256 = "11fpsh4w2zlqdqhk5snb276pcbx4p9g1igs94fympa9asfr2rxm3"; editedCabalFile = "d4474591079b806b8e26d102824d46c7e4c239afb3479ea8d1e8cbd39f015718"; buildDepends = [ @@ -85013,8 +86017,8 @@ self: { }: mkDerivation { pname = "mysql-simple"; - version = "0.2.2.4"; - sha256 = "044grjly1gyrgba2bfrii2pa14ff7v14ncyk3kj01g1zdxnwqjh6"; + version = "0.2.2.5"; + sha256 = "132igmgrgkpc0g9063d593ha3iv40k5dd017nlb07sz0qs9hi8w6"; buildDepends = [ attoparsec base base16-bytestring blaze-builder blaze-textual bytestring mysql old-locale pcre-light text time @@ -85416,8 +86420,8 @@ self: { }: mkDerivation { pname = "natural-transformation"; - version = "0.1"; - sha256 = "0qs8zfd3pwjr539453w94rddssw85ky695jz8rasn85sxp2kflbc"; + version = "0.2"; + sha256 = "1fxgbjf74kdag42hscplc5sn63z0idz2z2yykk1jz4zp71wa0wdp"; buildDepends = [ base ]; testDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -85658,6 +86662,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nero" = callPackage + ({ mkDerivation, base, bytestring, containers, doctest, Glob, lens + , safe, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "nero"; + version = "0.1.1"; + sha256 = "0wfrmdsmmwxashqdxxqc9nb3xr16m9ni05ypzq7ybyq0mgmaqzli"; + buildDepends = [ base bytestring containers lens safe text ]; + testDepends = [ + base bytestring doctest Glob lens tasty tasty-hunit text + ]; + homepage = "https://github.com/jdnavarro/nero"; + description = "Lens-based HTTP toolkit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nested-sets" = callPackage ({ mkDerivation, base, containers, hspec }: mkDerivation { @@ -85698,7 +86720,6 @@ self: { homepage = "http://netclock.slab.org/"; description = "Netclock protocol"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netcore" = callPackage @@ -86004,8 +87025,8 @@ self: { }: mkDerivation { pname = "network-anonymous-i2p"; - version = "0.9.2"; - sha256 = "1rn7i6f2ks9ddqsxpira25d7g7dhkm23lnyndpxknhvkj4d3zvk8"; + version = "0.10.0"; + sha256 = "0b7z7w105l1yd3xpnnl2z779m5zknf756cslksbbpsy16rn7kxfg"; buildDepends = [ attoparsec base bytestring exceptions mtl network network-attoparsec network-simple text transformers uuid @@ -86017,6 +87038,7 @@ self: { homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; description = "Haskell API for I2P anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-api-support" = callPackage @@ -86095,6 +87117,7 @@ self: { testDepends = [ base cabal-test-bin hspec hspec-server process ]; description = "Linux NetworkNameSpace Builder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bytestring" = callPackage @@ -86880,18 +87903,51 @@ self: { }) {}; "nicify" = callPackage - ({ mkDerivation, base, parsec, transformers }: + ({ mkDerivation, base, nicify-lib }: mkDerivation { pname = "nicify"; - version = "1.1"; - sha256 = "0m6cbzd1hjgsb5vhhlcx9kvyn7v8bv3h0zll7wlcyp8yaccvik3k"; - isLibrary = true; + version = "1.2.1"; + sha256 = "0qpm18md4jmfznfxqbi9aqvlqrgmiab7b477s11hwcb6y00kyfwk"; + isLibrary = false; isExecutable = true; + buildDepends = [ base nicify-lib ]; + description = "Pretty print the standard output of default `Show` instances"; + license = stdenv.lib.licenses.mit; + }) {}; + + "nicify-lib" = callPackage + ({ mkDerivation, base, parsec, transformers }: + mkDerivation { + pname = "nicify-lib"; + version = "1.0.1"; + sha256 = "0cp76s0msf1i8a7pkzjl6qgi18n7zdya3pg90ml1dnidg5nzh9kx"; buildDepends = [ base parsec transformers ]; - description = "Pretty print the standard output of show for algebraic datatypes"; + description = "Pretty print the standard output of default `Show` instances"; license = stdenv.lib.licenses.mit; }) {}; + "nicovideo-translator" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, dns, http-client, http-types, iso639, lens + , lens-aeson, random, setlocale, text, wai, warp, wreq, xml-conduit + }: + mkDerivation { + pname = "nicovideo-translator"; + version = "0.1.0.0"; + sha256 = "01qbmkr9h78iwyrgdijqyf06xl8wk2z9nn4v8dc5pb1gknlbp8wh"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson base bytestring case-insensitive containers dns http-client + http-types iso639 lens lens-aeson random setlocale text wai warp + wreq xml-conduit + ]; + jailbreak = true; + homepage = "https://github.com/dahlia/nicovideo-translator"; + description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "nikepub" = callPackage ({ mkDerivation, base, containers, filepath, GoogleChart, haskell98 , haxr, hs-twitter, HStringTemplate, HTTP, hxt, json, network @@ -87137,8 +88193,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "nonfree"; - version = "0.1.0.0"; - sha256 = "1cwxnkral8d33xgpjlqrv0d5q5c046siw9z56bhp53qpk40ihn81"; + version = "0.1.0.1"; + sha256 = "05jf3i9m58lwixd3mnj9ikgkrg1gdcxz7d8m5k5k5j3fdbbgbmqi"; buildDepends = [ base ]; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; @@ -87761,8 +88817,8 @@ self: { }: mkDerivation { pname = "objective"; - version = "1.0.2"; - sha256 = "01i1wsyxn0kgdgyc91wcqzmz80w6d1h6m1hpn3dnlrl35jjcwxdl"; + version = "1.0.3"; + sha256 = "1b6062isdmy5v6diqsgd8bigkmk4xy83hjglqrfns4n1a5c3fgzg"; buildDepends = [ base containers either exceptions free hashable monad-stm profunctors stm transformers unordered-containers void witherable @@ -87971,7 +89027,6 @@ self: { jailbreak = true; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "omaketex" = callPackage @@ -88143,19 +89198,20 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, attoparsec, base, case-insensitive, contravariant - , old-locale, postgresql-simple, pretty, product-profunctors - , profunctors, semigroups, text, time, transformers, uuid + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , case-insensitive, contravariant, postgresql-simple, pretty + , product-profunctors, profunctors, semigroups, text, time + , time-locale-compat, transformers, uuid }: mkDerivation { pname = "opaleye"; - version = "0.3.1"; - sha256 = "188c5n0ywmvfsh4sbbwi3p82is92x770mlfdkdbfm4bsqnsc8905"; - editedCabalFile = "a82fed5cc74432826c4a4704c424938d1d2653bafbda0124c9a0e628f78401cd"; + version = "0.3.1.2"; + sha256 = "01ldghza5l1qgcpvsphajfkq7g09fw0dm4vnya9wbs0hla307av9"; buildDepends = [ - attoparsec base case-insensitive contravariant old-locale - postgresql-simple pretty product-profunctors profunctors semigroups - text time transformers uuid + attoparsec base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors semigroups text time time-locale-compat transformers + uuid ]; testDepends = [ base postgresql-simple product-profunctors profunctors time @@ -88417,7 +89473,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell OpenSoundControl utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openssh-github-keys" = callPackage @@ -88612,7 +89667,6 @@ self: { homepage = "https://github.com/tsuraan/optimal-blocks"; description = "Optimal Block boundary determination for rsync-like behaviours"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimization" = callPackage @@ -88703,6 +89757,7 @@ self: { mkDerivation { pname = "optparse-applicative"; version = "0.10.0"; + revision = "1"; sha256 = "04hr6rzgc8h0c8fy748as3q7sc8vm94gvk0rw4gdj605z8hvaxcb"; editedCabalFile = "20d6ce280b028a493a1920dcc22bb39bee10e9c788a58e03dcaeecba97afffb0"; buildDepends = [ @@ -88938,7 +89993,6 @@ self: { homepage = "http://github.com/nedervold/origami"; description = "An un-SYB framework for transforming heterogenous data through folds"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "os-release" = callPackage @@ -89046,6 +90100,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "overture" = callPackage + ({ mkDerivation, base, doctest }: + mkDerivation { + pname = "overture"; + version = "0.0.5"; + sha256 = "0mv9iakq1yjawf7f0zckmxbzlcv2rlqngsllfsrcydi6lxazznzw"; + buildDepends = [ base ]; + testDepends = [ base doctest ]; + description = "An alternative to some of the Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "pack" = callPackage ({ mkDerivation, array, base, bytestring, lens, transformers , vector @@ -89138,6 +90204,7 @@ self: { mkDerivation { pname = "packedstring"; version = "0.1.0.1"; + revision = "1"; sha256 = "1x78pzzdlnpcmh9p37rlf8m5cxf3yqm2alf3whl4zpr9w25r0qj8"; editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf"; buildDepends = [ array base ]; @@ -89172,7 +90239,9 @@ self: { mkDerivation { pname = "packunused"; version = "0.1.1.4"; + revision = "1"; sha256 = "1ahb8wq7yxnfzwcvppk8cyhj9r51fz9ci1pwy0h4ql7iyc3z0vy8"; + editedCabalFile = "5ddb122ff2a1ac4e79226f31b4d8f7dab67bb5501d0e715d84dbfe36c845b772"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -89236,24 +90305,24 @@ self: { ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions , generics-sop, http-client, http-types, lens, lens-aeson, mmorph - , monad-control, mtl, template-haskell, text, time, transformers - , transformers-base, unordered-containers + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers }: mkDerivation { pname = "pagerduty"; - version = "0.0.1.1"; - sha256 = "0k3jj18vs1mp7k6jdqgrvs1nyzkc6gxcqnqp560nvfxpj18km9cb"; + version = "0.0.3"; + sha256 = "1jqg7k0vr78fv5cv0rn74v8p5jd4wvv6l5nc5xdwh46b7rjwcpj1"; buildDepends = [ aeson base bifunctors bytestring bytestring-conversion conduit data-default-class exceptions generics-sop http-client http-types lens lens-aeson mmorph monad-control mtl template-haskell text time - transformers transformers-base unordered-containers + time-locale-compat transformers transformers-base + transformers-compat unordered-containers ]; - jailbreak = true; homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "palette" = callPackage @@ -89332,7 +90401,9 @@ self: { mkDerivation { pname = "pandoc"; version = "1.13.2"; + revision = "2"; sha256 = "12kd71g70d1wzz19p5yq7f00hw8d4ra8ghn83g7yzsal8igl8p76"; + editedCabalFile = "1b9479a2579d76c43089283b6fb7a060e16050fd62fe0da896a722db815671d6"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -89388,10 +90459,9 @@ self: { ({ mkDerivation, base, containers, lens, pandoc-types }: mkDerivation { pname = "pandoc-lens"; - version = "0.3.1"; - sha256 = "1h943cyj6ph5w32rmkzlvszjbb7s65is1h9ifws4m7nj9mbn13lf"; + version = "0.3.2"; + sha256 = "1n0h3cf2yb5rmlfd0bbxlj3r8bm4h8yffd76fqsbw3s5jm0df4wb"; buildDepends = [ base containers lens pandoc-types ]; - jailbreak = true; homepage = "http://github.com/bgamari/pandoc-lens"; description = "Lenses for Pandoc documents"; license = stdenv.lib.licenses.bsd3; @@ -89541,6 +90611,7 @@ self: { mkDerivation { pname = "parallel-io"; version = "0.3.3"; + revision = "1"; sha256 = "0i86x3bf8pjlg6mdg1zg5lcrjpg75pbqs2mrgrbp4z4bkcmw051s"; editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee"; isLibrary = true; @@ -89733,11 +90804,11 @@ self: { }: mkDerivation { pname = "parsec"; - version = "3.1.8"; - sha256 = "01vqk7krbhy6bf30ydjdjvbzx5ynjdbc3dwlhzinzq6a69a6brlq"; + version = "3.1.9"; + sha256 = "1ja20cmj6v336jy87c6h3jzjp00sdbakwbdwp11iln499k913xvi"; buildDepends = [ base bytestring mtl text ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; - homepage = "http://www.cs.uu.nl/~daan/parsec.html"; + homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -89873,6 +90944,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "parseerror-eq" = callPackage + ({ mkDerivation, base, hspec, parsec }: + mkDerivation { + pname = "parseerror-eq"; + version = "0.1.0.0"; + sha256 = "1vyghahkmsvd6nj5armf2i3plnzp7mkcnx4a999c3yzxpic71vic"; + buildDepends = [ base parsec ]; + testDepends = [ base hspec parsec ]; + homepage = "https://github.com/stackbuilders/parseerror-eq"; + description = "Adds and Eq instance for Parsec's ParseError if needed"; + license = stdenv.lib.licenses.mit; + }) {}; + "parsek" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89990,6 +91074,7 @@ self: { mkDerivation { pname = "partial"; version = "0.1.0.0"; + revision = "1"; sha256 = "0ybh0yz68gawbfswk1s498asc1z7qw6b8qys7rasw5i5iw6vjvr8"; editedCabalFile = "f49cbb0cfb2f101a006bb54ada3982ae85b6413d019fd92927ce259b3666e172"; buildDepends = [ base ]; @@ -90160,7 +91245,6 @@ self: { homepage = "http://code.haskell.org/~thielema/patch-image/"; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "path-pieces" = callPackage @@ -90423,8 +91507,8 @@ self: { ({ mkDerivation, base, doctest, primitive, random, time }: mkDerivation { pname = "pcg-random"; - version = "0.1.1.0"; - sha256 = "0jflsspld5gfgcg2q9zmxqfyqdcdbld5d7vqfkr3ckgnwxx0kx61"; + version = "0.1.2.0"; + sha256 = "1h2ry2p1nnvh3prrl6xz18p3npccrb0p9qzq41lcn10sizfsgpzx"; buildDepends = [ base primitive random time ]; testDepends = [ base doctest ]; homepage = "http://github.com/cchalmers/pcg-random"; @@ -90492,8 +91576,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.4"; - sha256 = "1kvasljlrfmlskqzzglm6swkfmfrqycv0j0hswck0lcfzd8nxkna"; + version = "0.1.5"; + sha256 = "0b6n3sls6r65kn7i9z607ck99sxw2xxh7frljc09cx73iy71ml69"; buildDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -90574,7 +91658,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -90655,6 +91738,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "peano" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "peano"; + version = "0.1.0.1"; + sha256 = "0yzcxrl41dacvx2wkyxjj7hgvz56l4qb59r4h9rmaqd7jcwx5z9i"; + buildDepends = [ base ]; + description = "Peano numbers"; + license = "unknown"; + }) {}; + "peano-inf" = callPackage ({ mkDerivation, base, containers, lazysmallcheck }: mkDerivation { @@ -91068,8 +92162,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.2.1"; - sha256 = "079imqgx7ad6gl8x8drcdqfhw137k4n6rdb3j69sppq9aka9b72b"; + version = "2.1.3"; + sha256 = "1k1sjzxz96z6pgk4012v8p4w6scgm4g2j5fs4sjgsj9azp3b7gwh"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -91110,8 +92204,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.2.2"; - sha256 = "0hhxhzpivv63rxknrn2rpmxlmza8cd8hq1g7qiap4shn4s58r5nb"; + version = "2.1.3"; + sha256 = "0hgvpfgbwb1q0zkl5g9hxdz1wh4xbl0hx26j5944qcll5f6298is"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -91161,8 +92255,8 @@ self: { }: mkDerivation { pname = "persistent-redis"; - version = "0.3.1"; - sha256 = "1djwaahabjpj01hvg9hp6ldqxjn45hp1dl84bbgvini1f6ihh2bq"; + version = "0.3.2"; + sha256 = "0p5wjf4f201mpdwry188v1h9wf3fh1pvfsm663x4ipy3b1yc8b1k"; buildDepends = [ aeson attoparsec base binary bytestring hedis monad-control mtl path-pieces persistent scientific text time transformers @@ -91198,8 +92292,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.1.2"; - sha256 = "0knp5gr7js4i7a7gps10fdn33019h1k1wz6h3bf08ld1sl88sjha"; + version = "2.1.3"; + sha256 = "1vyfhiwahyfgv6xwbfyn42f19dijbmjshlyy6a5rf0bfllc2k7gf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -91222,8 +92316,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.1.0.1"; - sha256 = "14jalq90x6czhasc9d8s7j1nylgjhw96ialdqsxvg7iswdp753qx"; + version = "2.1.1"; + sha256 = "1bvmxpx8dqqsq87v079sw8wy795iykkz0fknrlpxhywja2j40dxc"; buildDepends = [ aeson base bytestring containers ghc-prim monad-control monad-logger path-pieces persistent tagged template-haskell text @@ -91282,7 +92376,6 @@ self: { ]; description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona" = callPackage @@ -91300,7 +92393,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-persona"; description = "Persona (BrowserID) library"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persona-idp" = callPackage @@ -91412,9 +92504,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "7.77"; - sha256 = "10pj15siwf4w92palwv4ziz0ax7wmzkkglvdiny8mr6y8kc7iakk"; - editedCabalFile = "a3540842f80b732f7769f221dd5e019aac7604b793268701fea5b6fb1d04f00b"; + version = "8.0"; + sha256 = "1pll0zr16f1h53vcsbbd69x8kkim165mvlgmlgdpf4p9gll01pra"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -91688,8 +92779,8 @@ self: { }: mkDerivation { pname = "picoparsec"; - version = "0.1.1"; - sha256 = "1b2dxms5bdiz2cci488cnar65jwv6mknhnm3qcff49ax4y9w8gi2"; + version = "0.1.2.1"; + sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci"; buildDepends = [ array base bytestring containers deepseq monoid-subclasses scientific text @@ -91753,8 +92844,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.2"; - sha256 = "0bvgijrgpv0yc8hkzj9mbm94z6v5s9w8ghjjm9ynh0qrpyf1dlli"; + version = "0.6.2.2"; + sha256 = "02913abxcqcr12v6nd0zmij2mq9bhhz4sqay6vkmvwfdc3mr6k4b"; buildDepends = [ aeson base bytestring containers either HsOpenSSL http-streams http-types io-streams mtl network old-locale random text time @@ -91771,8 +92862,8 @@ self: { }: mkDerivation { pname = "pipes"; - version = "4.1.4"; - sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb"; + version = "4.1.5"; + sha256 = "1c19am4dr6na9xpx4h7yngvbml0ghc1dbym8988hjhw84gq4lhfx"; buildDepends = [ base mmorph mtl transformers ]; testDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 @@ -91891,6 +92982,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pipes-cliff" = callPackage + ({ mkDerivation, async, base, bytestring, pipes, pipes-safe + , process, stm + }: + mkDerivation { + pname = "pipes-cliff"; + version = "0.10.0.0"; + sha256 = "1xzjw7bd96q7fg7q43rvcxv29p6ziknp6z08qzrnx5i4w9gjnk8s"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base bytestring pipes pipes-safe process stm + ]; + homepage = "http://www.github.com/massysett/pipes-cliff"; + description = "Streaming to and from subprocesses using Pipes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-concurrency" = callPackage ({ mkDerivation, async, base, pipes, stm }: mkDerivation { @@ -92230,11 +93339,12 @@ self: { }: mkDerivation { pname = "pipes-vector"; - version = "0.5.3"; - sha256 = "1ny8dd4sd55df412v9dy5z0vf3nbi4h46pjazyiaj056p2w723aa"; + version = "0.6"; + sha256 = "0a3q8cj05b6a6iy2gi8mp2qc6xvmwmiqvcd5i3v0kzvi3rv8fh86"; buildDepends = [ base monad-primitive pipes primitive transformers vector ]; + jailbreak = true; description = "Various proxies for streaming data into vectors"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -92274,6 +93384,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-zeromq4" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-safe, semigroups + , zeromq4-haskell + }: + mkDerivation { + pname = "pipes-zeromq4"; + version = "0.2.0.0"; + sha256 = "1zlj7vcn3ng11n80a9m37al7y322ph9grq5qxn022vpb82baxwr4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base bytestring pipes pipes-safe semigroups zeromq4-haskell + ]; + homepage = "https://github.com/peddie/pipes-zeromq4"; + description = "Pipes integration for ZeroMQ messaging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pipes-zlib" = callPackage ({ mkDerivation, base, bytestring, pipes, transformers, zlib , zlib-bindings @@ -92461,6 +93589,7 @@ self: { mkDerivation { pname = "plivo"; version = "0.2.0.0"; + revision = "1"; sha256 = "16q6jwnbzxhapmkzi2sn1k02z8gq11s9wp555fv7msv2if5axrp0"; editedCabalFile = "7ef78cd34067e8d72872b32bcad9d01537710c11efce159c990aeb4670e4efb3"; buildDepends = [ @@ -92763,14 +93892,18 @@ self: { }) {}; "pointful" = callPackage - ({ mkDerivation, base, containers, haskell-src, mtl, syb }: + ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb + , transformers + }: mkDerivation { pname = "pointful"; - version = "1.0.2"; - sha256 = "00xlxgdajkbi5d6gv88wdpwm16xdryshszz5qklryi0p65mmp99p"; - isLibrary = false; + version = "1.0.6"; + sha256 = "151cyy324g6cl5bdwcpbvcvpavj3x2592jbic1jq5q3fgahf5wqk"; + isLibrary = true; isExecutable = true; - buildDepends = [ base containers haskell-src mtl syb ]; + buildDepends = [ + base containers haskell-src-exts mtl syb transformers + ]; homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; @@ -92852,13 +93985,12 @@ self: { }: mkDerivation { pname = "pokitdok"; - version = "4.1.0.1"; - sha256 = "0cnrda2ahsam07pcn079wvq18hxjpyxik6qnqi5bzrdps9dwgl80"; + version = "4.1.0.2"; + sha256 = "08pknbn79hihkil1vcpr7a8ilah3i5b6lnlc41bmprycyqz5vj1w"; buildDepends = [ aeson base base64-string bytestring case-insensitive directory hex HTTP http-client http-conduit http-types strict text time ]; - jailbreak = true; homepage = "https://platform.pokitdok.com"; description = "PokitDok Platform API Client for Haskell"; license = stdenv.lib.licenses.mit; @@ -93136,6 +94268,7 @@ self: { mkDerivation { pname = "pool"; version = "0.1.2.1"; + revision = "1"; sha256 = "1fwwnwxk3kprr2z9y7bwa1qwxfkzwcb2n5l6vkq1c5s8gjls581c"; editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951"; buildDepends = [ base monad-control transformers ]; @@ -93371,8 +94504,8 @@ self: { }: mkDerivation { pname = "posix-paths"; - version = "0.2.0.4"; - sha256 = "1cym8c5hjjs7i2gx4n9m7a9zg7dls4wqnnr5bravj7gv2gh9s67q"; + version = "0.2.0.5"; + sha256 = "046y5i4hw4a326r3145yrfd1p6sn3b9xsn6rdk73nv74ks4wrn5v"; buildDepends = [ base bytestring unix ]; testDepends = [ base bytestring doctest HUnit QuickCheck unix ]; description = "POSIX filepath/directory functionality"; @@ -93464,20 +94597,20 @@ self: { }) {}; "postgresql-binary" = callPackage - ({ mkDerivation, attoparsec, base, base-prelude, bytestring, HTF - , loch-th, placeholders, postgresql-libpq, QuickCheck - , quickcheck-instances, scientific, text, time, transformers, uuid + ({ mkDerivation, attoparsec, base-prelude, bytestring, HTF, loch-th + , placeholders, postgresql-libpq, QuickCheck, quickcheck-instances + , scientific, text, time, transformers, uuid }: mkDerivation { pname = "postgresql-binary"; - version = "0.5.1"; - sha256 = "09y7llixrzqyl64zv2a40i6jsvq2c03szw8y7y8pz81awd6pid4q"; + version = "0.5.2"; + sha256 = "1fwh3r0f63wcwnw544jdirzsd0brslkqahn8d2iwr2jvpm5f0pqh"; buildDepends = [ - attoparsec base base-prelude bytestring loch-th placeholders - scientific text time transformers uuid + attoparsec base-prelude bytestring loch-th placeholders scientific + text time transformers uuid ]; testDepends = [ - base base-prelude bytestring HTF postgresql-libpq QuickCheck + base-prelude bytestring HTF postgresql-libpq QuickCheck quickcheck-instances scientific text time uuid ]; homepage = "https://github.com/nikita-volkov/postgresql-binary"; @@ -93904,21 +95037,23 @@ self: { }) {}; "prednote" = callPackage - ({ mkDerivation, base, containers, contravariant, QuickCheck - , quickpull, rainbow, split, text, transformers + ({ mkDerivation, base, bytestring, containers, contravariant + , QuickCheck, rainbow, split, tasty, tasty-quickcheck, tasty-th + , text, transformers }: mkDerivation { pname = "prednote"; - version = "0.32.0.0"; - sha256 = "1vpwy5dfx66c2h0b9vs8w1iaj57ls2kww0g7shzbsrqk7k83v5lh"; + version = "0.32.0.6"; + sha256 = "0ammlm2dfhjmgy2ackrk4gvwgxz8sph8d2n4pwk2vl17hy024dbj"; isLibrary = true; isExecutable = true; buildDepends = [ - base containers contravariant rainbow split text transformers + base bytestring containers contravariant rainbow split text + transformers ]; testDepends = [ - base containers contravariant QuickCheck quickpull rainbow split - text transformers + base bytestring containers contravariant QuickCheck rainbow split + tasty tasty-quickcheck tasty-th text transformers ]; homepage = "http://www.github.com/massysett/prednote"; description = "Evaluate and display trees of predicates"; @@ -93952,6 +95087,7 @@ self: { mkDerivation { pname = "prefix-units"; version = "0.1.0.2"; + revision = "1"; sha256 = "07b5s2bsqlaad06dgr5psidfgi1nmgc5c16j6kzayw9f4najjrav"; editedCabalFile = "492d6b953a52678e44a880c5272c30175eed27c3f2bd4de82fc29eee4b4db00a"; buildDepends = [ base ]; @@ -94103,11 +95239,10 @@ self: { ({ mkDerivation, base, containers, pretty, QuickCheck }: mkDerivation { pname = "presburger"; - version = "1.3"; - sha256 = "0chwx0906gsmbnjkf14d864qzfvxb5gzaih7nq7ckfc6icbc4x25"; + version = "1.3.1"; + sha256 = "15yhqc6gk14dsqr4b0x87i1xw0sc3iscw28grg4vmcspsjxil0l6"; buildDepends = [ base containers pretty ]; testDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "http://github.com/yav/presburger"; description = "A decision procedure for quantifier-free linear arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -94291,6 +95426,7 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.1.0"; + revision = "1"; sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8"; editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec"; buildDepends = [ base ghc-prim ]; @@ -94304,7 +95440,9 @@ self: { mkDerivation { pname = "primitive"; version = "0.5.4.0"; + revision = "1"; sha256 = "05gdgj383xdrdkhxh26imlvs8ji0z28ny38ms9snpvv5i8l2lg10"; + editedCabalFile = "df0a129c168c61a06a02123898de081b1d0b254cce6d7ab24b8f43ec37baef9e"; buildDepends = [ base ghc-prim ]; testDepends = [ base ghc-prim ]; homepage = "https://github.com/haskell/primitive"; @@ -94312,6 +95450,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "primitive_0_6" = callPackage + ({ mkDerivation, base, ghc-prim, transformers }: + mkDerivation { + pname = "primitive"; + version = "0.6"; + sha256 = "08lpsvrgdvqh8xw7f1wzkvwdnkizblbym8y2xpknk0y62f9g799l"; + buildDepends = [ base ghc-prim transformers ]; + testDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell/primitive"; + description = "Primitive memory-related operations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -94525,8 +95676,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.3.2"; - sha256 = "0kv4fpg5qndqf97c1znhibhzqd5z6mdk38ma72yk3ixkp45rvarh"; + version = "0.3.3.4"; + sha256 = "1cnq7lzrwckyhd829ir8h1rbh404yw0m40lka7sl23i7mak51mbp"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -94626,13 +95777,13 @@ self: { }: mkDerivation { pname = "process-streaming"; - version = "0.6.7.0"; - sha256 = "08j6yf2ma7w3nqcv9bslykvm4mp0pws1n538fvsq2j2dnzxq3f1h"; + version = "0.7.0.2"; + sha256 = "07d9bhcl62ca6vjcqm783p1fknzzbw9jkm8grrkn67pncx107iin"; buildDepends = [ - base bifunctors conceit containers contravariant foldl free pipes - pipes-bytestring pipes-concurrency pipes-parse pipes-safe - pipes-text process semigroups text transformers transformers-compat - void + base bifunctors bytestring conceit containers contravariant foldl + free pipes pipes-bytestring pipes-concurrency pipes-parse + pipes-safe pipes-text process semigroups text transformers + transformers-compat void ]; testDepends = [ attoparsec base bifunctors bytestring containers directory doctest @@ -94660,7 +95811,6 @@ self: { multiset QuickCheck quickcheck-instances template-haskell text transformers ]; - jailbreak = true; description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -94744,6 +95894,7 @@ self: { mkDerivation { pname = "product-profunctors"; version = "0.6"; + revision = "3"; sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; editedCabalFile = "295331ca6bf3325e30e5d1e4a343856805734e37711c6579bbcd323a082e49ca"; buildDepends = [ base contravariant profunctors template-haskell ]; @@ -94792,8 +95943,8 @@ self: { }: mkDerivation { pname = "profiteur"; - version = "0.1.2.2"; - sha256 = "11h4hgwwh8vq96vkca2w1rc5l0aikfhp6550x5ax04k4p3l9lzhy"; + version = "0.2.0.0"; + sha256 = "0pgjd7a8xflnk0v2r2smc5qb7j8zsr5qrlxkdk36547plfjfvnv4"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -94825,7 +95976,9 @@ self: { mkDerivation { pname = "profunctors"; version = "4.4.1"; + revision = "1"; sha256 = "1x5q4bc18cyxajv39xxbxzgpq75xzrhx450n8rc3p8gir92hx645"; + editedCabalFile = "72f05aa59d302bcd53277bdff17e920bc0128e5787b2f8edf584c517cd084db7"; buildDepends = [ base comonad distributive semigroupoids tagged transformers ]; @@ -94940,6 +96093,7 @@ self: { mkDerivation { pname = "projection"; version = "0.1"; + revision = "1"; sha256 = "0g9zrdp92w8ygrsmbw4600xaf8d17sm4pq68qd6z7hnf8zps22c1"; editedCabalFile = "805db4a9404200c6d8c00b7e96f95c9c71e3595b6601f75efed7237ad5bed30b"; buildDepends = [ base ]; @@ -95276,6 +96430,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pseudo-trie" = callPackage + ({ mkDerivation, base, data-default, hspec, QuickCheck + , quickcheck-instances, semigroups + }: + mkDerivation { + pname = "pseudo-trie"; + version = "0.0.2"; + sha256 = "0pblqy1bp16wr4zpvd2l54la407f3jf13b55iy21j94fsyrn93x0"; + buildDepends = [ base data-default semigroups ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "A tagged rose-tree with short circuited unique leaves"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pseudomacros" = callPackage ({ mkDerivation, base, old-locale, template-haskell, time }: mkDerivation { @@ -95449,8 +96617,8 @@ self: { }: mkDerivation { pname = "pugixml"; - version = "0.3.0"; - sha256 = "0xma82nwl35scc43r8yhd0irhf1d60ssxs3gh6y717cpl29zv5wa"; + version = "0.3.2"; + sha256 = "0pvvx7cd16a7cjp991l487p0vgpkdyv7ic64brz92bkjxgrpw94i"; buildDepends = [ base bytestring data-default-class template-haskell ]; @@ -96119,6 +97287,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quantfin" = callPackage + ({ mkDerivation, base, containers, mersenne-random-pure64, mtl + , random-fu, rvar, transformers, vector + }: + mkDerivation { + pname = "quantfin"; + version = "0.1.0.1"; + sha256 = "1rx8jrdhlqnbj28d2yi7vb3x1z7g5qrvzrhfx44zdiqlgw215f05"; + buildDepends = [ + base containers mersenne-random-pure64 mtl random-fu rvar + transformers vector + ]; + homepage = "https://github.com/boundedvariation/quantfin"; + description = "Quant finance library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quantities" = callPackage ({ mkDerivation, base, containers, doctest, Glob, hlint, hspec, mtl , parsec, process, regex-compat @@ -96255,8 +97440,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.10"; - sha256 = "02qkpgsr1w0fs2c4q9hrhx6m65lqss4f4qnfhb51ljpcaj8p1v6y"; + version = "0.3.11"; + sha256 = "041s6963czs1pz0fc9cx17lgd6p83czqy2nxji7bhxqxwl2j15h2"; buildDepends = [ array base bytestring containers hashable old-time QuickCheck text time unordered-containers @@ -96400,8 +97585,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "quickcheck-unicode"; - version = "1.0.0.0"; - sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq"; + version = "1.0.0.1"; + sha256 = "1a8nl6x7l9b22yx61wm0bh2n1xzb1hd5i5zgg1w4fpaivjnrrhi4"; buildDepends = [ base QuickCheck ]; homepage = "https://github.com/bos/quickcheck-unicode"; description = "Generator and shrink functions for testing Unicode-related software"; @@ -96660,12 +97845,15 @@ self: { }) {}; "rainbow" = callPackage - ({ mkDerivation, base, terminfo, text }: + ({ mkDerivation, base, bytestring, process, QuickCheck, text }: mkDerivation { pname = "rainbow"; - version = "0.20.4.0"; - sha256 = "1h6rih0dn5ll8sz0j1w1wi9f6b8592fzf7c1mvl1d8bplcgahqhs"; - buildDepends = [ base terminfo text ]; + version = "0.22.0.2"; + sha256 = "0bzjh7j0ckdzvmfb29pi1l7h28hg77rykwj4bndzi55mbqkabrs9"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base bytestring process text ]; + testDepends = [ base bytestring process QuickCheck text ]; homepage = "https://www.github.com/massysett/rainbow"; description = "Print text to terminal with colors and effects"; license = stdenv.lib.licenses.bsd3; @@ -96687,18 +97875,18 @@ self: { }) {}; "rainbox" = callPackage - ({ mkDerivation, array, barecheck, base, ChasingBottoms, QuickCheck - , rainbow, tasty, tasty-quickcheck, text, transformers + ({ mkDerivation, array, base, bytestring, ChasingBottoms + , QuickCheck, rainbow, tasty, tasty-quickcheck, text, transformers }: mkDerivation { pname = "rainbox"; - version = "0.10.0.0"; - sha256 = "0yq9xk11rckdb72hqis0mwff82qm4hk2nahgns3fr5fxg4c7wrj1"; + version = "0.10.0.2"; + sha256 = "1s08p7ckni17q15p059nccpyq19iw5chfy28m1k8c6vm4fcrkjyw"; isLibrary = true; isExecutable = true; - buildDepends = [ array base rainbow text transformers ]; + buildDepends = [ array base bytestring rainbow text transformers ]; testDepends = [ - array barecheck base ChasingBottoms QuickCheck rainbow tasty + array base bytestring ChasingBottoms QuickCheck rainbow tasty tasty-quickcheck text transformers ]; homepage = "http://www.github.com/massysett/rainbox"; @@ -96857,6 +98045,25 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "random-hypergeometric" = callPackage + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, math-functions + , mwc-random, QuickCheck, random-fu, vector + }: + mkDerivation { + pname = "random-hypergeometric"; + version = "0.1.0.0"; + sha256 = "0jg4j2nwijb5ic9zl5y9miqhn881dmf0s49gj8f818as3mhvqlgh"; + buildDepends = [ base math-functions random-fu ]; + testDepends = [ + base Cabal cabal-test-quickcheck math-functions mwc-random + QuickCheck random-fu vector + ]; + homepage = "https://github.com/srijs/random-hypergeometric"; + description = "Random variate generation from hypergeometric distributions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "random-shuffle" = callPackage ({ mkDerivation, base, MonadRandom, random }: mkDerivation { @@ -97619,6 +98826,7 @@ self: { mkDerivation { pname = "reasonable-operational"; version = "0.1.0.1"; + revision = "1"; sha256 = "18d49rzpygbsd17d9hz79bbgj6jznlx2jzhkw43gzw3rhvklwyh9"; editedCabalFile = "963ed294ec0f951858022c25b9713b06e65d2a05098068a1183110e298b5c8cf"; buildDepends = [ base ]; @@ -97656,6 +98864,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "record-gl" = callPackage + ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit + , linear, OpenGL, record, tagged, template-haskell, test-framework + , test-framework-hunit, vector + }: + mkDerivation { + pname = "record-gl"; + version = "0.1.0.0"; + revision = "1"; + sha256 = "0z0qwnzayarwlamig9g4zngq3mcddhl3pgalir811lxf3a3g1dqq"; + editedCabalFile = "6d2017f9112690ce717a1bb7dad9d2d4272b01b4bce8ee3ae79247f97f277d85"; + buildDepends = [ + base base-prelude containers GLUtil linear OpenGL record tagged + template-haskell vector + ]; + testDepends = [ + base HUnit linear OpenGL record tagged test-framework + test-framework-hunit + ]; + description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "records" = callPackage ({ mkDerivation, base, kinds, type-functions }: mkDerivation { @@ -97797,6 +99028,7 @@ self: { mkDerivation { pname = "redis-resp"; version = "0.3.2"; + revision = "1"; sha256 = "07lvgq2l2fahhc9z3hjjjpx3n4rzdxl2l2ww9brxnv23432xpz97"; editedCabalFile = "74f97af6250dcf3b26d424e5a53a4a9bdcda5de4f7f4d5fc4d6b686f60f6d931"; buildDepends = [ @@ -97868,6 +99100,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reexport-crypto-random" = callPackage + ({ mkDerivation, base, crypto-api }: + mkDerivation { + pname = "reexport-crypto-random"; + version = "0.1.0.0"; + sha256 = "0lraykl190x0cj65z495c11vi4pcg3g8gz1bdgdndf6662lp56x9"; + buildDepends = [ base crypto-api ]; + license = stdenv.lib.licenses.gpl2; + }) {}; + "ref" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -98031,17 +99273,18 @@ self: { "reflex" = callPackage ({ mkDerivation, base, containers, dependent-map, dependent-sum - , lens, mtl, primitive, semigroups, template-haskell, these + , mtl, primitive, semigroups, template-haskell, these }: mkDerivation { pname = "reflex"; - version = "0.0.1"; - sha256 = "0b9ilwmip5rwibb5vai7cr2jv42yv7pc2w0klydhvv7p7yj077lk"; + version = "0.1.0"; + sha256 = "1l64kz1haicq4qfw5nrn93jrv37c93zz6z0xkhjnm5rxff7qrdns"; buildDepends = [ - base containers dependent-map dependent-sum lens mtl primitive + base containers dependent-map dependent-sum mtl primitive semigroups template-haskell these ]; jailbreak = true; + homepage = "https://github.com/ryantrinkle/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -98065,7 +99308,6 @@ self: { version = "0.2.3"; sha256 = "1bbmmvrprbig4ic1vq8jjhb4nxxkn0a4dxxaa62i02ms3wb1vsf5"; buildDepends = [ base blaze-html blaze-markup reform text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using blaze-html with Reform"; license = stdenv.lib.licenses.bsd3; @@ -98078,7 +99320,6 @@ self: { version = "0.0.4"; sha256 = "1f8rh9wiax6g7kh1j0j2zmqr7n1ll9ijn2xqp1shhsq8vp30f8fg"; buildDepends = [ base blaze-markup reform shakespeare text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using Hamlet with Reform"; license = stdenv.lib.licenses.bsd3; @@ -99033,19 +100274,19 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Algorithms using the Repa array library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "repa-array" = callPackage ({ mkDerivation, base, bytestring, double-conversion, mtl - , primitive, repa-eval, repa-stream, text, vector + , primitive, repa-convert, repa-eval, repa-stream, text, vector }: mkDerivation { pname = "repa-array"; - version = "4.0.0.2"; - sha256 = "0169fqf07yqpx93n8qlq3yfnqv9rhc19r1a6rcvbrva7h8kh04nb"; + version = "4.1.0.1"; + sha256 = "04bi2j2y5rrpkfzys6ma0d5fhsrapip0xb43gqsgcqz3rk89lank"; buildDepends = [ - base bytestring double-conversion mtl primitive repa-eval - repa-stream text vector + base bytestring double-conversion mtl primitive repa-convert + repa-eval repa-stream text vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -99067,6 +100308,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "repa-convert" = callPackage + ({ mkDerivation, base, primitive, vector }: + mkDerivation { + pname = "repa-convert"; + version = "4.1.0.1"; + sha256 = "197lqlyvljbngnckw742kij7frsx1rwakfa13xwaij6gxmyz9zx6"; + buildDepends = [ base primitive vector ]; + homepage = "http://repa.ouroborus.net"; + description = "Packing and unpacking binary data"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "repa-devil" = callPackage ({ mkDerivation, base, libdevil, repa, transformers }: mkDerivation { @@ -99111,7 +100364,7 @@ self: { homepage = "http://repa.ouroborus.net"; description = "Examples using the Repa array library"; license = stdenv.lib.licenses.bsd3; - }) { inherit (pkgs) llvm;}; + }) { inherit (self.llvmPackages) llvm;}; "repa-fftw" = callPackage ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty @@ -99134,8 +100387,8 @@ self: { }: mkDerivation { pname = "repa-flow"; - version = "4.0.0.2"; - sha256 = "1kznd1dl4rxwbc0k9asrwqm4pygq97x95g3zmy9v6lhbm6p1kpsd"; + version = "4.1.0.1"; + sha256 = "0d3j4wc3f0rbxmmj2hq9m8m9hjnad6siard279xs7sd4qzwkcpg7"; buildDepends = [ base bytestring containers directory filepath primitive repa-array repa-eval repa-stream text vector @@ -99212,8 +100465,8 @@ self: { ({ mkDerivation, base, mtl, primitive, vector }: mkDerivation { pname = "repa-stream"; - version = "4.0.0.1"; - sha256 = "0vvkgazq30skj9yr763vc5vs3zacjssvyqci721n99j7h8my7r9x"; + version = "4.1.0.1"; + sha256 = "17n48ixypx5a3anj212h4vxa6sqwk5yssjqyprb8lb3mnqfdlxmm"; buildDepends = [ base mtl primitive vector ]; jailbreak = true; homepage = "http://repa.ouroborus.net"; @@ -99439,8 +100692,8 @@ self: { }: mkDerivation { pname = "reserve"; - version = "0.1.0"; - sha256 = "09b570l6hyn0wfd4nb9xpqrpdb97gbaxnbjlz25y6s0pfg5s1yzp"; + version = "0.1.1"; + sha256 = "152pngw3xrlyrq905a231hi9hg3pf5ddpcihwic496rng5hd5hj2"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -99595,20 +100848,19 @@ self: { "rest-client" = callPackage ({ mkDerivation, aeson-utils, base, bytestring, case-insensitive , data-default, exceptions, http-conduit, http-types, hxt - , hxt-pickle-utils, monad-control, mtl, primitive, resourcet - , rest-types, tostring, transformers, transformers-base - , transformers-compat, uri-encode, utf8-string + , hxt-pickle-utils, monad-control, mtl, resourcet, rest-types + , tostring, transformers, transformers-base, transformers-compat + , uri-encode, utf8-string }: mkDerivation { pname = "rest-client"; - version = "0.5.0.0"; - sha256 = "0clhqp78i6823sxfj5xahajg450s15qqf7l2kc9dpfirz49xxpva"; + version = "0.5.0.2"; + sha256 = "1sykmz3mms714sypkpbjhk6dapb0saqsvwjjxnr3cklxdhxhyvz6"; buildDepends = [ aeson-utils base bytestring case-insensitive data-default exceptions http-conduit http-types hxt hxt-pickle-utils - monad-control mtl primitive resourcet rest-types tostring - transformers transformers-base transformers-compat uri-encode - utf8-string + monad-control mtl resourcet rest-types tostring transformers + transformers-base transformers-compat uri-encode utf8-string ]; description = "Utility library for use in generated API client libraries"; license = stdenv.lib.licenses.bsd3; @@ -99650,8 +100902,8 @@ self: { }: mkDerivation { pname = "rest-example"; - version = "0.2.0.0"; - sha256 = "1442hi8av2vlbzr1ffjfn32plxs0i60bb0g0fnjrprjmcii7dzd5"; + version = "0.2.0.1"; + sha256 = "0pc8q6ky8flh0rz4s3fl7fyharg1p026v689s8h709mcf5q6kvkf"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -99675,8 +100927,8 @@ self: { }: mkDerivation { pname = "rest-gen"; - version = "0.17.0.1"; - sha256 = "1rx5a57r66gbzd78i7klb1hzzjxdahv1833xv2jm28k0yn09kwgz"; + version = "0.17.0.2"; + sha256 = "09jvhmk3bkdz7mwjm9qdmr4kn2mzx2dmzpjv4ryqi7bshf52rdsw"; buildDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -99764,6 +101016,7 @@ self: { mkDerivation { pname = "rest-wai"; version = "0.1.0.7"; + revision = "1"; sha256 = "0agvs26x26cgzls66jx7pj2qdn01snjr11rv7sd3x3h4g3ww375v"; editedCabalFile = "1b15b246eb06e388c3ac37b6a7eb5697109f04f085a46ced92d9e4e809841981"; buildDepends = [ @@ -99843,22 +101096,24 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary + , bytestring, containers, data-default, doctest, mtl, network + , scientific, text, time, unordered-containers, utf8-string, vector }: mkDerivation { pname = "rethinkdb"; - version = "1.15.2.1"; - sha256 = "017fq9mhqdw78hrnjm9n0nipi182361bxh1qzjpb8djc8azx49b5"; + version = "1.16.0.0"; + sha256 = "125gg719isf60yv5yj0frkg92bp42cb43d4qzs7jqic1wvhx32yy"; + isLibrary = true; + isExecutable = true; buildDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector + aeson attoparsec base base64-bytestring binary bytestring + containers data-default mtl network scientific text time + unordered-containers utf8-string vector ]; testDepends = [ base doctest ]; homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 1.15"; + description = "A driver for RethinkDB 1.16"; license = stdenv.lib.licenses.asl20; }) {}; @@ -100181,6 +101436,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ring-buffer" = callPackage + ({ mkDerivation, base, mtl, primitive, vector }: + mkDerivation { + pname = "ring-buffer"; + version = "0.1.1"; + sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7"; + buildDepends = [ base mtl primitive vector ]; + jailbreak = true; + homepage = "http://github.com/bgamari/ring-buffer"; + description = "A concurrent, mutable ring-buffer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -100331,7 +101599,6 @@ self: { homepage = "https://github.com/lfairy/robot"; description = "Simulate keyboard and mouse events"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "robots-txt" = callPackage @@ -100569,6 +101836,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees" = callPackage + ({ mkDerivation, base, containers, data-default, hspec, pseudo-trie + , QuickCheck, quickcheck-instances, semigroups, transformers + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.1.1"; + sha256 = "0ii9jxyd7q0x30zyp1gal29msd81n5vj613mkxxavjlz9ar9gvgx"; + buildDepends = [ + base containers data-default pseudo-trie semigroups transformers + ]; + testDepends = [ base hspec QuickCheck quickcheck-instances ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosezipper" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -101228,7 +102511,6 @@ self: { buildDepends = [ base control-monad-exception safe-failure ]; description = "control-monad-exception Instances for safe-failure"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-freeze" = callPackage @@ -101759,14 +103041,14 @@ self: { "satchmo" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , minisat, mtl, process + , lens, minisat, mtl, process }: mkDerivation { pname = "satchmo"; - version = "2.9.6"; - sha256 = "0k2h3q71y7bkhkfwj53wabf7ga1z27001y5cxahpgphaa8q5fgvp"; + version = "2.9.7.1"; + sha256 = "1wrbf5mnk4f1m40dw2pyp66g76rvhqbxv7qwdx6lha2wjx7z1020"; buildDepends = [ - array base bytestring containers directory minisat mtl process + array base bytestring containers directory lens minisat mtl process ]; testDepends = [ array base ]; homepage = "https://github.com/jwaldmann/satchmo"; @@ -101884,7 +103166,6 @@ self: { homepage = "http://rd.slavepianos.org/t/sc3-rdu"; description = "Haskell bindings to sc3-rdu (sc3 rd ugens)"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalable-server" = callPackage @@ -101921,19 +103202,22 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, download-curl, HUnit, regex-base - , regex-tdfa, tagsoup, text + ({ mkDerivation, base, bytestring, curl, download-curl, HUnit + , regex-base, regex-tdfa, tagsoup, text }: mkDerivation { pname = "scalpel"; - version = "0.1.1"; - sha256 = "0ypr6i4in1vvxjxi03r29q7mvig390bnpn2bcmjm9q1w51ypjdnr"; + version = "0.1.2"; + revision = "1"; + sha256 = "1h0fj56a3mppcc2pfjs7philm2jy1yb3vvzbvswsans5x4xvh8dv"; + editedCabalFile = "5062d07770eb7d265cd5c76dc7e3c90c36a2a4f6a7bc3e688d139cd8114a8f5c"; buildDepends = [ - base bytestring download-curl regex-base regex-tdfa tagsoup text + base bytestring curl download-curl regex-base regex-tdfa tagsoup + text ]; testDepends = [ - base bytestring download-curl HUnit regex-base regex-tdfa tagsoup - text + base bytestring curl download-curl HUnit regex-base regex-tdfa + tagsoup text ]; homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; @@ -102099,6 +103383,7 @@ self: { mkDerivation { pname = "scholdoc"; version = "0.1.3"; + revision = "1"; sha256 = "0dsbr4nk56cmbgdnk91s39lc4qp2wb39hkyisaf4f1n6nmx8zmn4"; editedCabalFile = "bbe7070ca2ca48d86095c9a45120d2bfbf6a480b3894117d70e0f8e3ccabb435"; isLibrary = true; @@ -102133,6 +103418,7 @@ self: { mkDerivation { pname = "scholdoc-citeproc"; version = "0.6"; + revision = "1"; sha256 = "0wy8cwr933zcqb85qscj9l9qcl2xv8mkbd2g9b4gs7c1k5b6khll"; editedCabalFile = "33a066de8000d8bdb0a8f04f71baca64e27f4a2bb2d2a330f6d5a7f81090b118"; isLibrary = true; @@ -102391,7 +103677,9 @@ self: { mkDerivation { pname = "scotty"; version = "0.9.1"; + revision = "1"; sha256 = "0w07ghnd7l8ibfbl8p74lwn8gxy3z28mp0rlv5crma3yh42irsqm"; + editedCabalFile = "5a0fefbeb7107a096658d4f0743084bd26e9b0c84853fd560715b0aa46c5802a"; buildDepends = [ aeson base blaze-builder bytestring case-insensitive data-default http-types monad-control mtl regex-compat text transformers @@ -102593,8 +103881,8 @@ self: { }: mkDerivation { pname = "scroll"; - version = "1.20150314"; - sha256 = "10snsi42a0jzz87fa99zdyp9dg4i7ywd83hfg2yb8nn218f2hf0z"; + version = "1.20150323"; + sha256 = "06nzvvqn592jgf93zck74w1nhzjq0llzypsy7x575ljvprb3ph0d"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -102670,7 +103958,6 @@ self: { jailbreak = true; description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sde-solver" = callPackage @@ -102743,6 +104030,7 @@ self: { mkDerivation { pname = "sdl2-ttf"; version = "0.2.0"; + revision = "1"; sha256 = "0ikdkzzzh3wwzypas5bd6wcm17cckxj2qyqkw6y76v0k2kpnzc35"; editedCabalFile = "25cb57affc8ad5bb0ff533037512a39803f4fcd961cb2aca3632f0ab7dc2540b"; buildDepends = [ base sdl2 ]; @@ -103096,6 +104384,7 @@ self: { mkDerivation { pname = "semigroupoids"; version = "4.3"; + revision = "1"; sha256 = "1qn0rffc1zskk6f34pxrp96iarxgp36l2404rs6sz9khl1hh58sf"; editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3"; buildDepends = [ @@ -103199,8 +104488,8 @@ self: { }: mkDerivation { pname = "semver"; - version = "0.3.2"; - sha256 = "194khg21cnmkghyfs74xk5vvzp7mbjck9h0ckngrl5r93qc3dbrz"; + version = "0.3.3.1"; + sha256 = "1cf8dcxq4s479f826drncqc4hd07hv330zsipkrn0vc30sbkdlrn"; buildDepends = [ attoparsec base deepseq text ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/semver"; @@ -103384,14 +104673,15 @@ self: { "seqloc-datafiles" = callPackage ({ mkDerivation, attoparsec, base, biocore, bytestring, cmdtheline - , conduit, conduit-extra, filepath, hashable, iteratee, lifted-base - , monads-tf, pretty, QuickCheck, random, resourcet, seqloc - , transformers, transformers-base, unordered-containers, vector + , conduit, conduit-extra, directory, filepath, hashable, iteratee + , lifted-base, monads-tf, pretty, process, QuickCheck, random + , resourcet, seqloc, transformers, transformers-base + , unordered-containers, vector }: mkDerivation { pname = "seqloc-datafiles"; - version = "0.4"; - sha256 = "0bmgg41123c1rhq6d1vq8x6ci435smaancm8gcg9iirhxi5wwvp5"; + version = "0.4.2"; + sha256 = "175nifix2vax5xsinz604mm3nid7krh5a9d7gqpy02wh4f5qdrja"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -103400,6 +104690,11 @@ self: { random resourcet seqloc transformers transformers-base unordered-containers vector ]; + testDepends = [ + attoparsec base biocore bytestring conduit conduit-extra directory + hashable iteratee lifted-base process QuickCheck random seqloc + transformers transformers-base unordered-containers vector + ]; homepage = "http://www.ingolia-lab.org/seqloc-datafiles-tutorial.html"; description = "Read and write BED and GTF format genome annotations"; license = stdenv.lib.licenses.mit; @@ -103845,6 +105140,7 @@ self: { mkDerivation { pname = "setenv"; version = "0.1.1.3"; + revision = "1"; sha256 = "0cnbgrvb9byyahb37zlqrj05rj25v190crgcw8wmlgf0mwwxyn73"; editedCabalFile = "c5916ac0d2a828473cd171261328a290afe0abd799db1ac8c310682fe778c45b"; buildDepends = [ base unix ]; @@ -103914,6 +105210,7 @@ self: { mkDerivation { pname = "sexp-show"; version = "0.1.1.0"; + revision = "1"; sha256 = "1ip1y1y2z2d6ib3ihq18j93081cp2lkwjm27bc0d0ihixd154gy5"; editedCabalFile = "314f05a4542c657517d485faa31ec23324458782cf0112acda948fb7092a154c"; isLibrary = false; @@ -103971,7 +105268,9 @@ self: { mkDerivation { pname = "sfmt"; version = "0.1.0"; + revision = "1"; sha256 = "1amfcnh3jrb54zpl6vrdmngqvmjiczzinhq3r9gx9hb1r635v04x"; + editedCabalFile = "e0b52289bb67a211186ecaa0f45275870e792430d71929cf4f1a66f29da071a4"; buildDepends = [ base bytestring entropy primitive ]; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; @@ -104137,8 +105436,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.14.3"; - sha256 = "1s5xm205k3pvndn21vd0y9mnggrm91psf64mw445r08xasi658vl"; + version = "0.15"; + sha256 = "02zqkm248fvv6nh10nj6rw7ks5w832q2zrzzk9z9gp1zrqnbhxhk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104213,6 +105512,7 @@ self: { version = "0.1.2"; sha256 = "1xsh6bjrr0l4vqn8iqlkv8s0y5qwaqqz3yjlxk0y3fsi1qz28yxs"; buildDepends = [ base bytestring css-text hjsmin shake text ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; @@ -104225,6 +105525,7 @@ self: { version = "0.1.0"; sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0"; buildDepends = [ base bytestring bzlib shake tar ]; + jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Actions"; license = stdenv.lib.licenses.bsd3; @@ -104316,7 +105617,6 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare-text" = callPackage @@ -104529,18 +105829,19 @@ self: { "shelltestrunner" = callPackage ({ mkDerivation, base, cmdargs, Diff, directory, filemanip - , filepath, HUnit, parsec, process, regex-tdfa, test-framework - , test-framework-hunit, utf8-string + , filepath, HUnit, parsec, pretty-show, process, regex-tdfa, safe + , test-framework, test-framework-hunit, utf8-string }: mkDerivation { pname = "shelltestrunner"; - version = "1.3.4"; - sha256 = "1gfx2l99v95i6amrlcs1qbk9p37qyz21px3a224h5hrr9svhrsqy"; + version = "1.3.5"; + sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2"; isLibrary = false; isExecutable = true; buildDepends = [ - base cmdargs Diff directory filemanip filepath HUnit parsec process - regex-tdfa test-framework test-framework-hunit utf8-string + base cmdargs Diff directory filemanip filepath HUnit parsec + pretty-show process regex-tdfa safe test-framework + test-framework-hunit utf8-string ]; homepage = "http://joyful.com/shelltestrunner"; description = "A tool for testing command-line programs"; @@ -104830,6 +106131,7 @@ self: { homepage = "https://github.com/markus-git/signals"; description = "Stream Processing for Embedded Domain Specific Languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "signed-multiset" = callPackage @@ -105124,18 +106426,18 @@ self: { "simple-log" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath - , MonadCatchIO-transformers, mtl, old-locale, SafeSemaphore, text - , time, transformers + , MonadCatchIO-transformers, mtl, SafeSemaphore, text, time + , transformers }: mkDerivation { pname = "simple-log"; - version = "0.3.1"; - sha256 = "1xddgjcl4ny2z0cc75psnl73ddql9myxwq4h7l8aib5hpbcw1gld"; + version = "0.3.2"; + sha256 = "1nlnxjv2p6fkk069480czn0wg1m2jcw1g2sb38cb524kv0qn1kr0"; buildDepends = [ base containers deepseq directory filepath - MonadCatchIO-transformers mtl old-locale SafeSemaphore text time - transformers + MonadCatchIO-transformers mtl SafeSemaphore text time transformers ]; + jailbreak = true; homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -105330,8 +106632,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "simple-smt"; - version = "0.5.4"; - sha256 = "153f0h0432rh3ff5cvsjcnwaq6ydiprs16ximp1rcamwzm0nl8hp"; + version = "0.6.0"; + sha256 = "15dnd6vjf8zl0bi5r4pczxdns8614rvdq1f44sgrmy8crc4x9d0c"; buildDepends = [ base process ]; description = "A simple way to interact with an SMT solver process"; license = stdenv.lib.licenses.bsd3; @@ -105455,6 +106757,7 @@ self: { mkDerivation { pname = "simpleirc-lens"; version = "0.1.0.0"; + revision = "2"; sha256 = "0lr4zrp8h7xgg8zsznawqkkzh3pvlzfw5hl6n0hss5ramb71ccy5"; editedCabalFile = "618750d5b230316747d59d784bd40481a4404443316fc9c3a73e1349e3d10975"; buildDepends = [ base bytestring simpleirc ]; @@ -105505,6 +106808,7 @@ self: { mkDerivation { pname = "simplesmtpclient"; version = "0.2"; + revision = "1"; sha256 = "0z8g82222nvh3yhn8qisr8qqnsv02zxjyzs32qrcg2pshbd5mdj8"; editedCabalFile = "e6021c7bbf5e50c15433dca491f4618483229203c810a7b71e7c42094e13ad25"; buildDepends = [ array base directory network old-time ]; @@ -106092,6 +107396,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smartconstructor" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "smartconstructor"; + version = "0.2.0.0"; + sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv"; + buildDepends = [ base template-haskell ]; + homepage = "http://github.com/frerich/smartconstructor"; + description = "A package exposing a helper function for generating smart constructors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smartword" = callPackage ({ mkDerivation, base, haskell98, pretty, unix, utf8-string }: mkDerivation { @@ -106338,7 +107654,6 @@ self: { version = "0.2.1.2"; sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh"; buildDepends = [ base blaze-html snap-core ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; license = stdenv.lib.licenses.bsd3; @@ -106399,8 +107714,8 @@ self: { }: mkDerivation { pname = "snap-cors"; - version = "1.2.6"; - sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8"; + version = "1.2.7"; + sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc"; buildDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers @@ -106456,6 +107771,7 @@ self: { mkDerivation { pname = "snap-extras"; version = "0.9"; + revision = "1"; sha256 = "143n0y3cavfgn6f40sh7i441q77ys4lkfv0g9cai714n7yr0ya1v"; editedCabalFile = "3a360180bc4463874da336da5b4f1271a1cce298ca36cf9407a04823d4df58d8"; buildDepends = [ @@ -106477,6 +107793,7 @@ self: { mkDerivation { pname = "snap-loader-dynamic"; version = "0.10.0.2"; + revision = "1"; sha256 = "0fnpzhwnj3dsqwx880391x9x6y0ry8f6dfrzkfs963zib9l3qvh7"; editedCabalFile = "2f64bcfd0c84d6f6f161c4418778e5c463d127a383c2f3f8216155d161d87d7d"; buildDepends = [ @@ -106533,6 +107850,7 @@ self: { mkDerivation { pname = "snap-server"; version = "0.9.4.6"; + revision = "1"; sha256 = "01qfqc63qwq604s5vy0sln7l9zhqndyqbb1y1xf397rrn97xhrpp"; editedCabalFile = "32c4388b62e047caebb4a51bd79cb592032a0cb4f2aa56c7eb8bff15e85588bf"; buildDepends = [ @@ -106613,6 +107931,7 @@ self: { mkDerivation { pname = "snaplet-acid-state"; version = "0.2.6.1"; + revision = "1"; sha256 = "0wlawnsxisslqzspa29swsdmncgx04z3rd1bhwx73mx5pksykw60"; editedCabalFile = "812a72ecdd562ff80cdb396a26235d963bbec7ca97e4afa728d5ca65716ef0a7"; buildDepends = [ acid-state base snap text ]; @@ -106755,7 +108074,6 @@ self: { homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-haxl" = callPackage @@ -107053,17 +108371,16 @@ self: { "snaplet-recaptcha" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , configurator, heist, http-conduit, lens - , MonadCatchIO-transformers, mtl, snap, text + , MonadCatchIO-transformers, mtl, snap, text, transformers }: mkDerivation { pname = "snaplet-recaptcha"; - version = "1.0.1"; - sha256 = "05d5070z9ljxfp353q7q5nl46c7wx4bnsjm3hiw2258bnz2ih185"; + version = "1.0.3"; + sha256 = "02f5fv70r7zjzycrrqsd1jwgpa7sq1m6rci74dlcbnms7z9cpv26"; buildDepends = [ aeson base blaze-builder bytestring configurator heist http-conduit - lens MonadCatchIO-transformers mtl snap text + lens MonadCatchIO-transformers mtl snap text transformers ]; - jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -107468,6 +108785,7 @@ self: { buildDepends = [ base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random ]; + jailbreak = true; homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; @@ -107481,9 +108799,8 @@ self: { }: mkDerivation { pname = "soap"; - version = "0.2.2.4"; - sha256 = "03zqbdmk44jds6sqaq90rr5zprnrw524c084jndl9hgq4gd4d39c"; - editedCabalFile = "2599e7a2bf2c9f599571acb194625003de1237fe2031a39113a7a83805c2884c"; + version = "0.2.2.5"; + sha256 = "1imh9g2my0d981prai69yr9yf7linvaijcn80zlyaz44pasxnrw7"; buildDepends = [ base bytestring conduit configurator data-default exceptions http-client http-types iconv mtl resourcet text @@ -107493,11 +108810,9 @@ self: { base bytestring hspec HUnit text unordered-containers xml-conduit xml-conduit-writer ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-openssl" = callPackage @@ -107506,17 +108821,15 @@ self: { }: mkDerivation { pname = "soap-openssl"; - version = "0.1.0.1"; - sha256 = "0b0d15nvg9qhf0ccsmw53qpcnxsw2cqslkmfzr1hw90whzaw3l5h"; + version = "0.1.0.2"; + sha256 = "03w389yhybzvc06gpxigibqga9mr7m41rkg1ki3n686j9xzm8210"; buildDepends = [ base configurator data-default HsOpenSSL http-client http-client-openssl soap text ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -107526,17 +108839,15 @@ self: { }: mkDerivation { pname = "soap-tls"; - version = "0.1.1.1"; - sha256 = "1vcmpcq7yw65v90cg1v279mvyvrvibi6zf71vf7d21jzxpldskih"; + version = "0.1.1.2"; + sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4"; buildDepends = [ base configurator connection data-default http-client http-client-tls soap text tls x509 x509-store x509-validation ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using tls package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sock2stream" = callPackage @@ -108378,6 +109689,7 @@ self: { mkDerivation { pname = "split"; version = "0.2.2"; + revision = "1"; sha256 = "0xa3j0gwr6k5vizxybnzk5fgb3pppgspi6mysnp2gwjp2dbrxkzr"; editedCabalFile = "9098e40414e8491b0a400f5874408e577a444c4eadf1e03fb4ea6dfcc32e30c4"; buildDepends = [ base ]; @@ -108479,6 +109791,7 @@ self: { mkDerivation { pname = "spoon"; version = "0.3.1"; + revision = "1"; sha256 = "1m41k0mfy6fpfrv2ym4m5jsjaj9xdfl2iqpppd3c4d0fffv51cxr"; editedCabalFile = "e46c5e919cc9d0c7b0f671cddb631ef0979622a1e2250c59c7e491a799944527"; buildDepends = [ base deepseq ]; @@ -108805,8 +110118,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "srcloc"; - version = "0.4.1"; - sha256 = "0cd15d9dval7zi4li48yd6a3jk62861d4qxwvhxz4a98m63519cz"; + version = "0.5.0"; + sha256 = "1a5233jkdhzjl9vnmaxyswbnkadrf5h6v66f957dakvmdhs1m13m"; buildDepends = [ base ]; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "Data types for managing source code locations"; @@ -109008,7 +110321,6 @@ self: { homepage = "https://github.com/tsuraan/stable-tree"; description = "Trees whose branches are resistant to change"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -109060,6 +110372,58 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stackage-curator" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, Cabal + , classy-prelude-conduit, conduit, conduit-extra, containers + , data-default-class, directory, filepath, hspec, http-client + , http-client-tls, http-conduit, mono-traversable, mtl, old-locale + , optparse-applicative, process, QuickCheck, semigroups + , stackage-types, stm, streaming-commons, system-fileio + , system-filepath, tar, temporary, text, time, transformers + , unix-compat, utf8-string, xml-conduit, yaml, zlib + }: + mkDerivation { + pname = "stackage-curator"; + version = "0.7.0.3"; + sha256 = "0sc9q1h3v1hbxya7csrm9jffrvp91sa2mvdpndkcarfpn39jv09y"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson async base bytestring Cabal classy-prelude-conduit conduit + conduit-extra containers data-default-class directory filepath + http-client http-client-tls http-conduit mono-traversable mtl + old-locale optparse-applicative process semigroups stackage-types + stm streaming-commons system-fileio system-filepath tar temporary + text time transformers unix-compat utf8-string xml-conduit yaml + zlib + ]; + testDepends = [ + base Cabal classy-prelude-conduit containers hspec http-client + http-client-tls QuickCheck text yaml + ]; + homepage = "https://github.com/fpco/stackage"; + description = "Tools for curating Stackage bundles"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stackage-types" = callPackage + ({ mkDerivation, aeson, base, Cabal, containers, exceptions + , hashable, semigroups, text, unordered-containers, vector + }: + mkDerivation { + pname = "stackage-types"; + version = "1.0.0"; + sha256 = "17077awl2bfrhpdlqsl4dxb7hxq4dr5hxqcviyv1cbxlk6z38a4z"; + buildDepends = [ + aeson base Cabal containers exceptions hashable semigroups text + unordered-containers vector + ]; + homepage = "https://github.com/fpco/stackage-types"; + description = "Shared data types between various Stackage packages"; + license = stdenv.lib.licenses.mit; + }) {}; + "standalone-haddock" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath , optparse-applicative @@ -109325,8 +110689,8 @@ self: { }: mkDerivation { pname = "statistics"; - version = "0.13.2.1"; - sha256 = "0giibqpnjndnhvxqsr8ikcxxfhz3ws0mk3ckykq2sfwz7gkipvva"; + version = "0.13.2.3"; + sha256 = "1gbghzbacfrm7vn24ssx7wz9sycafxk9b306zm6cdlsr954v296n"; buildDepends = [ aeson base binary deepseq erf math-functions monad-par mwc-random primitive vector vector-algorithms vector-binary-instances @@ -109371,6 +110735,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "statistics-hypergeometric-genvar" = callPackage + ({ mkDerivation, base, math-functions, mwc-random, primitive + , statistics + }: + mkDerivation { + pname = "statistics-hypergeometric-genvar"; + version = "0.1.0.0"; + sha256 = "05j83vaklwi73yr4q4yq5f36wzmbas73lxkj0dkg0w1ss97syv7m"; + buildDepends = [ + base math-functions mwc-random primitive statistics + ]; + homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; + description = "Random variate generation from hypergeometric distributions"; + license = stdenv.lib.licenses.mit; + }) {}; + "statistics-linreg" = callPackage ({ mkDerivation, base, MonadRandom, random, random-shuffle, safe , statistics, vector @@ -109597,8 +110977,8 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-chans"; - version = "3.0.0.2"; - sha256 = "1zsa092yjxsdq8nm2yqagdfpip3i3ff3xdwvys99ns7ridxbyynh"; + version = "3.0.0.3"; + sha256 = "058miz12xm21lghc4bi06grsddd8hf2x9x5qdh0dva6lk0h9y7mk"; buildDepends = [ base stm ]; homepage = "http://code.haskell.org/~wren/"; description = "Additional types of channels for STM"; @@ -109646,24 +111026,22 @@ self: { }) {}; "stm-containers" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers + ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t + , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck + , transformers, unordered-containers }: mkDerivation { pname = "stm-containers"; - version = "0.2.8"; - sha256 = "0dqnhi99bq093zb815q8l0yhkvm0r27h230hcjmvcp01934xga0x"; + version = "0.2.9"; + sha256 = "0p2lyz1s98cxdcqfamqyx7dxxa4fzxr0a93cbm7lnmzfjvk48p52"; buildDepends = [ base-prelude focus hashable list-t loch-th placeholders primitive transformers ]; testDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers + base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude + placeholders primitive QuickCheck transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; @@ -109767,6 +111145,7 @@ self: { mkDerivation { pname = "stm-queue-extras"; version = "0.2.0.0"; + revision = "1"; sha256 = "1qd6zsr2lkkg5yxp72l38h00b2xj40jn38qx9sfvgpss6rkda40s"; editedCabalFile = "0c90122c2c5998a0b60d00506effde335dbd71ad60bc1b798759a05d4fb3193b"; buildDepends = [ base stm stm-chans ]; @@ -110463,8 +111842,8 @@ self: { ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { pname = "stringsearch"; - version = "0.3.6.5"; - sha256 = "1mjvb1qr4fkxv5qvq4jfswa3dcj3dwzvwx7dbp2wqw8zand41lsq"; + version = "0.3.6.6"; + sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9"; buildDepends = [ array base bytestring containers ]; homepage = "https://bitbucket.org/dafis/stringsearch"; description = "Fast searching, splitting and replacing of ByteStrings"; @@ -110507,8 +111886,8 @@ self: { }: mkDerivation { pname = "stripe-haskell"; - version = "0.1.3.0"; - sha256 = "0crh5kmb3bql0ba8srs58hn68q6cl9iaxy2p4phmwzw4xzganawq"; + version = "0.1.3.1"; + sha256 = "0c0g1ixjja49ifdch06flsb1k233sazy7yybqskacv7xmb1bpixy"; buildDepends = [ aeson base bytestring either HsOpenSSL http-streams io-streams mtl random text time transformers unordered-containers @@ -110695,8 +112074,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.5.11.1"; - sha256 = "18d5f25wsjryvh7pzj9wsra5pcna484v4yq8fpdbbic2cp2j3vg1"; + version = "0.5.11.2"; + sha256 = "1rbr1vkrlbvqijhrqq3f1dq8vn0q12832rlkbynmnknn6a682n8x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -110928,7 +112307,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell SuperCollider utilities"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "supercollider-midi" = callPackage @@ -111484,6 +112862,7 @@ self: { mkDerivation { pname = "syntax"; version = "1.0.0.0"; + revision = "1"; sha256 = "1dhbzbf1zlpfjhnacqfhzvjznwlzv39c12a3y8ivqhplnkmqsm7x"; editedCabalFile = "7f3d7f3a8c8aedb78145f4d8a992815cdb644d839a5431b23e5fad0a62d7dd5c"; buildDepends = [ @@ -111749,7 +113128,6 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Efficient signal processing using runtime compilation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synthesizer-midi" = callPackage @@ -111840,8 +113218,8 @@ self: { }: mkDerivation { pname = "system-fileio"; - version = "0.3.16.1"; - sha256 = "037p2i5gmcnw3qqh3yhn700w51kkyc7rpw9c77wlgdq5bgbyfkbk"; + version = "0.3.16.2"; + sha256 = "17mk1crlgrh9c9lfng6a2fdk49m2mbkkdlq5iysl1rzwkn12mmkd"; buildDepends = [ base bytestring system-filepath text time unix ]; testDepends = [ base bytestring chell system-filepath temporary text time @@ -112532,6 +113910,7 @@ self: { mkDerivation { pname = "takahashi"; version = "0.2.0.2"; + revision = "1"; sha256 = "0iwwmb0przjjgfz9xav4whgqh09dq4ndil29dmq2bp81wryay0l4"; editedCabalFile = "907771d78ac3db503a9d832bae2dcc3a20d03a3a7698ff7769cb9e84703b27a1"; buildDepends = [ base mtl reasonable-lens reasonable-operational ]; @@ -112793,8 +114172,8 @@ self: { }: mkDerivation { pname = "tasty-golden"; - version = "2.2.2.4"; - sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c"; + version = "2.3.0.1"; + sha256 = "19jlfxhgrphsv7nfwsfil5ci2snlm9qsqwswnzn68pa3440zqiji"; buildDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary-rc @@ -113075,6 +114454,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tce-conf" = callPackage + ({ mkDerivation, base, containers, HUnit }: + mkDerivation { + pname = "tce-conf"; + version = "1.1"; + sha256 = "1c3wr9rab7835dfg9qmxhprb2r21iyig1wkvwl49h7brhmhxzpnh"; + buildDepends = [ base containers ]; + testDepends = [ base containers HUnit ]; + homepage = "http://hub.darcs.net/dino/tce-conf"; + description = "Very simple config file reading"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tconfig" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -113159,6 +114551,7 @@ self: { mkDerivation { pname = "teeth"; version = "0.1.0.0"; + revision = "1"; sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl"; editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416"; buildDepends = [ base ]; @@ -113209,13 +114602,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "template-haskell_2_9_0_0" = callPackage - ({ mkDerivation, base, containers, pretty }: + "template-haskell_2_10_0_0" = callPackage + ({ mkDerivation, base, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.9.0.0"; - sha256 = "0mqphyd77jw87n648zpizh2cggm0958y47jjl84r55s1ndhm7j54"; - buildDepends = [ base containers pretty ]; + version = "2.10.0.0"; + sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im"; + buildDepends = [ base pretty ]; + jailbreak = true; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -113916,6 +115310,7 @@ self: { mkDerivation { pname = "testing-feat"; version = "0.4.0.2"; + revision = "1"; sha256 = "15gi6w7p4alnih9grklhhr8338y1aal07admbz4n2f724hnhyb2j"; editedCabalFile = "0168dde1e9ac0e7a1f80a33c12a6c5d2b7c5e59e4dcd060ffb8d82f100c4dd3f"; buildDepends = [ base mtl QuickCheck tagshare template-haskell ]; @@ -113998,6 +115393,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tex2txt" = callPackage + ({ mkDerivation, base, containers, deepseq, parsec }: + mkDerivation { + pname = "tex2txt"; + version = "0.1.0.0"; + sha256 = "1q41kphll7xhbccwyvlsvk5vxisig23ipmcqf7v9qc3rx1hb0p0w"; + isLibrary = true; + isExecutable = true; + buildDepends = [ base containers deepseq parsec ]; + homepage = "http://textmining.lt/tex2txt/"; + description = "LaTeX to plain-text conversion"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, network-uri, pandoc-types, parsec, process, split, syb @@ -114212,14 +115621,13 @@ self: { ({ mkDerivation, base, tasty, tasty-hunit, text, text-format }: mkDerivation { pname = "text-manipulate"; - version = "0.1.2.1"; - sha256 = "1cr1f0d7xxj6nr5rlqhnijjrd5k7xpfamqdd8j9pbwx2qi91vimz"; + version = "0.1.3.1"; + sha256 = "0k7mh9p6c8yif8sbfgqclk9v9jzymhlpv66bypn0z1y3p4ywfgjc"; buildDepends = [ base text text-format ]; testDepends = [ base tasty tasty-hunit text ]; homepage = "https://github.com/brendanhay/text-manipulate"; description = "Case conversion, word boundary manipulation, and textual subjugation"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-normal" = callPackage @@ -114286,21 +115694,22 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, nats - , quickcheck-instances, semigroups, tasty, tasty-hunit + , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, transformers , transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "0.6.0.1"; - sha256 = "01abl9vah82v8z1a8la57afnvj0hd3ri1lb7bj6w5dmzsv8pjp41"; + version = "0.7.0.1"; + sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a"; buildDepends = [ array base bytestring ghc-prim nats semigroups template-haskell text transformers void ]; testDepends = [ - array base bytestring nats quickcheck-instances tasty tasty-hunit - tasty-quickcheck text transformers transformers-compat void + array base bytestring ghc-prim nats QuickCheck quickcheck-instances + tasty tasty-hunit tasty-quickcheck text transformers + transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; @@ -114317,8 +115726,8 @@ self: { }: mkDerivation { pname = "text-show-instances"; - version = "0.2"; - sha256 = "1zmjv5l5a60iir5w6w9jhb22ywid680s7k1xhw6jmd5d0bml27jk"; + version = "0.3.0.1"; + sha256 = "1a6ybgx5jivacy7b0bja5f7an1xq9mjmr2x348knaf84v2wqws9p"; buildDepends = [ base binary bytestring containers directory haskeline hoopl hpc old-locale old-time pretty random semigroups tagged @@ -114344,6 +115753,7 @@ self: { mkDerivation { pname = "text-stream-decode"; version = "0.1.0.5"; + revision = "1"; sha256 = "1s2lncs5k8rswg1bpf4vz5p1maj46bsgf7ar4lzcla9bf3f4bppy"; editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd"; buildDepends = [ base bytestring text ]; @@ -114550,8 +115960,8 @@ self: { }: mkDerivation { pname = "th-desugar"; - version = "1.5.2"; - sha256 = "0kd5yn98nhji9yshnai4ffw7p8a1mn3xslbw57lvgmyln96sw096"; + version = "1.5.3"; + sha256 = "1bnbx5fpdnw24q3cjq1riccing8wadhl2xa588kf1qdf1nd9g7i0"; buildDepends = [ base containers mtl syb template-haskell th-lift th-orphans ]; @@ -114602,27 +116012,24 @@ self: { "th-instance-reification" = callPackage ({ mkDerivation, base, containers, HTF, HUnit, list-extras, loch-th - , placeholders, QuickCheck, QuickCheck-GenT, quickcheck-instances - , template-haskell, th-expand-syns + , placeholders, QuickCheck, quickcheck-instances, template-haskell + , th-expand-syns }: mkDerivation { pname = "th-instance-reification"; - version = "0.1.2"; - sha256 = "0r16s7m0yy3siy9nbqvpv66gk7c6xzz8ccdf9abpqap15vkkz7sc"; + version = "0.1.3"; + sha256 = "1aiq4ygxdh9mz59wcnhbjr74sk7l20dvwpjkc4nkj2048axq17h1"; buildDepends = [ base containers list-extras loch-th placeholders template-haskell th-expand-syns ]; testDepends = [ base containers HTF HUnit list-extras loch-th placeholders - QuickCheck QuickCheck-GenT quickcheck-instances template-haskell - th-expand-syns + QuickCheck quickcheck-instances template-haskell th-expand-syns ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-instances" = callPackage @@ -114836,6 +116243,7 @@ self: { mkDerivation { pname = "these"; version = "0.4.2"; + revision = "1"; sha256 = "0hs59i07k1lkynvdpymjvl1va2frc3aq6wyrmbi7mz3vmz0bjcp7"; editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629"; buildDepends = [ @@ -114912,6 +116320,7 @@ self: { mkDerivation { pname = "thorn"; version = "0.2"; + revision = "1"; sha256 = "1krxfsgj4ciifg76khsl4lw1nb40xx4gs07nwd84ail85s394h1h"; editedCabalFile = "d19e959e95f55075f6f4f0013cbc980e2c351c871e3d9d5bbe2febafb7711b9a"; buildDepends = [ @@ -115530,7 +116939,6 @@ self: { homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-recurrence" = callPackage @@ -116296,8 +117704,8 @@ self: { ({ mkDerivation, base, ghc-prim, void }: mkDerivation { pname = "total"; - version = "1.0.1"; - sha256 = "03c7ic8yd6803m7xjpbfwfvds9p251x6biak580q9578a0p664y6"; + version = "1.0.2"; + sha256 = "1di1iblxijdffczv3yni8bj1yjjc2258w7dxf8iwrd5n5h6574d4"; buildDepends = [ base ghc-prim void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -116319,12 +117727,11 @@ self: { ({ mkDerivation, base, cmdargs, directory, process, time }: mkDerivation { pname = "touched"; - version = "0.1.0.3"; - sha256 = "050z99flcklpwl1lccdi3lsq6v0zxzj21r73743ijvxchh7y488h"; + version = "0.2.0.1"; + sha256 = "0lik2glqynjwcd64bdla2jsfy4yqqk4aap5f0c9zkqv9g916bxgi"; isLibrary = true; isExecutable = true; buildDepends = [ base cmdargs directory process time ]; - jailbreak = true; description = "Library (and cli) to execute a procedure on file change"; license = stdenv.lib.licenses.mit; }) {}; @@ -116385,18 +117792,17 @@ self: { }) {}; "trace" = callPackage - ({ mkDerivation, base, containers, either, kan-extensions + ({ mkDerivation, base, containers, deepseq, either, kan-extensions , monad-control, mtl, profunctors, transformers, transformers-base , transformers-compat }: mkDerivation { pname = "trace"; - version = "0.1.0.4"; - sha256 = "1x3920fvv2vjhbzss87lqi6d9d04lcc7nxifq3yjzhzg45rzy2cn"; - editedCabalFile = "c7889409f09df52fe6f14db2dc020899bf2810550aaa250d9c64e1318d00dbef"; + version = "0.1.0.5"; + sha256 = "19l06mxw5n9r6mnygvgvrsrdkwyf2zxfjb0ky23v2bgrs5wjx4vc"; buildDepends = [ - base containers either kan-extensions monad-control mtl profunctors - transformers transformers-base transformers-compat + base containers deepseq either kan-extensions monad-control mtl + profunctors transformers transformers-base transformers-compat ]; description = "A monad transformer for tracing provenience of errors"; license = stdenv.lib.licenses.mit; @@ -116840,7 +118246,9 @@ self: { mkDerivation { pname = "trifecta"; version = "1.5.1.3"; + revision = "1"; sha256 = "1yd55bfhdn8ckkf2c5084fsnfwhib229xw9bn2a4lwpkzbbpflxw"; + editedCabalFile = "4aef1e889929b131bcfbc3b111cc865b1c31f86be983aee768adbfeadee03f2a"; buildDepends = [ ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html blaze-markup bytestring charset comonad containers deepseq @@ -116850,7 +118258,6 @@ self: { testDepends = [ base directory doctest filepath parsers QuickCheck ]; - jailbreak = true; homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; license = stdenv.lib.licenses.bsd3; @@ -116887,6 +118294,7 @@ self: { mkDerivation { pname = "trivial-constraint"; version = "0.3.0.0"; + revision = "1"; sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y"; editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b"; buildDepends = [ base ]; @@ -116938,6 +118346,7 @@ self: { mkDerivation { pname = "tsession"; version = "0.1"; + revision = "2"; sha256 = "1rj11vyd272h66cjx8pq6smcpi65n3vlfv4g7indcnpcz4w5l6rk"; editedCabalFile = "afd89984a633388a2db5ad107968c92693527eb6f746318c4752993633705e57"; buildDepends = [ base containers mtl time transformers ]; @@ -117017,6 +118426,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "ttrie" = callPackage + ({ mkDerivation, atomic-primops, base, hashable, primitive, stm }: + mkDerivation { + pname = "ttrie"; + version = "0.1.0.0"; + sha256 = "1lyz2hyi52fc0w1pix15g5h88y9x66wfw65k8bm4zc79irfv969h"; + buildDepends = [ atomic-primops base hashable primitive stm ]; + jailbreak = true; + homepage = "http://github.com/mcschroeder/ttrie"; + description = "Contention-free STM hash map"; + license = stdenv.lib.licenses.mit; + }) {}; + "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl @@ -117119,6 +118541,7 @@ self: { mkDerivation { pname = "tuple-morph"; version = "0.1.0.0"; + revision = "4"; sha256 = "1zi6nh1z7z2jz5h0pvdm2czfy1rx7ixnnvp9akcpas19npgyfk94"; editedCabalFile = "835c4661ff3b962ec5fa6f1899c6cb0d241362f06636478935fd5475c684eada"; buildDepends = [ base HList template-haskell ]; @@ -117239,6 +118662,7 @@ self: { mkDerivation { pname = "twentefp-eventloop-graphics"; version = "0.1.0.4"; + revision = "1"; sha256 = "086vx0849c7kmsz5pa4jwzp24cwaf4482bq37dr7jrqx22hvk4lm"; editedCabalFile = "2a887ef5e938d11f5944ea59ced4cf4bd22930b452f6e6b884f58031761cf817"; buildDepends = [ @@ -117502,6 +118926,7 @@ self: { mkDerivation { pname = "twitter-conduit"; version = "0.1.0"; + revision = "2"; sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji"; editedCabalFile = "e70397da5f43d657c6c3bef7419810f61675e78aa0b0da688b1f5939d1e11bf8"; isLibrary = true; @@ -118205,8 +119630,9 @@ self: { mkDerivation { pname = "types-compat"; version = "0.1.1"; + revision = "2"; sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby"; - editedCabalFile = "9d6a31178b383e430ec161d2329d9b52bcf164266f3064e66da53d865825fc96"; + editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041"; buildDepends = [ base ]; homepage = "https://github.com/philopon/types-compat"; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; @@ -118279,8 +119705,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.0.0.9"; - sha256 = "0ak54chjaw1vnwb7jd8fki2qvpdry5ycwh5ap9wjv61zbdscw74k"; + version = "0.0.0.10"; + sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm"; buildDepends = [ base binary bytestring containers deepseq template-haskell time tzdata vector @@ -118478,19 +119904,18 @@ self: { "uhc-light" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, fgl, filepath, hashable, mtl, network, old-locale - , primitive, process, syb, uhc-util, uulib, vector + , primitive, process, syb, transformers, uhc-util, uulib, vector }: mkDerivation { pname = "uhc-light"; - version = "1.1.8.7"; - sha256 = "05ki2zmravvnikn9d5ldiaxafyqnf2ghh7w2jpq1gzpx2mwslrrp"; - editedCabalFile = "d2ebe192f81a8eec4d1c0bc1b5a52a78c00d1839754ec75a88c16bc63c722f2d"; + version = "1.1.8.10"; + sha256 = "12rrcvmqpani5pp9qpf4yqsgvbzx4xwj87nfw0kl4mrhl4gd8c8d"; isLibrary = true; isExecutable = true; buildDepends = [ array base binary bytestring containers directory fgl filepath - hashable mtl network old-locale primitive process syb uhc-util - uulib vector + hashable mtl network old-locale primitive process syb transformers + uhc-util uulib vector ]; homepage = "https://github.com/UU-ComputerScience/uhc"; description = "Part of UHC packaged as cabal/hackage installable library"; @@ -118499,18 +119924,18 @@ self: { "uhc-util" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , directory, fgl, hashable, ListLike, mtl, process, syb, time - , time-compat, uulib + , directory, fclabels, fgl, hashable, ListLike, mtl, process, syb + , time, time-compat, uulib }: mkDerivation { pname = "uhc-util"; - version = "0.1.5.0"; - sha256 = "1im2hn285lmi2gvlhyi78hhhq0mb72hv74jn2cwrzqb03lav8q52"; + version = "0.1.5.1"; + sha256 = "0ipqs9lli10y5nyr0gw91wih9kqlgsxipq7xn8pq3zivmbwswm54"; buildDepends = [ - array base binary bytestring containers directory fgl hashable - ListLike mtl process syb time time-compat uulib + array base binary bytestring containers directory fclabels fgl + hashable ListLike mtl process syb time time-compat uulib ]; - homepage = "https://github.com/UU-ComputerScience/uhc-utils"; + homepage = "https://github.com/UU-ComputerScience/uhc-util"; description = "UHC utilities"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -118741,8 +120166,8 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.8.1"; - sha256 = "0y3y8m271spkmzc3182v8j06kspkzv03yxiscaa1vvhm2sbqp2is"; + version = "0.8.2"; + sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i"; buildDepends = [ base ghc-prim QuickCheck random transformers ]; jailbreak = true; homepage = "https://github.com/sjoerdvisscher/unfoldable"; @@ -118963,8 +120388,8 @@ self: { ({ mkDerivation, base, containers, logict, mtl }: mkDerivation { pname = "unification-fd"; - version = "0.9.0"; - sha256 = "0fdnpcpcpjlxlwxpqlawwbgqhs1p9lrksy5ln5isyvr06hwqh7ki"; + version = "0.10.0"; + sha256 = "1jin4w4csy6vhjrqk4lwn6aa6ic3xqnk86fsasznp2x9jv3rzw2b"; buildDepends = [ base containers logict mtl ]; homepage = "http://code.haskell.org/~wren/"; description = "Simple generic unification algorithms"; @@ -119409,7 +120834,6 @@ self: { buildDepends = [ array base mtl unix ]; description = "Unlambda interpreter"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unlit" = callPackage @@ -119709,6 +121133,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.0.1"; + sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5"; + buildDepends = [ attoparsec base bytestring ]; + testDepends = [ + attoparsec base bytestring derive HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://travis-ci.org/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, containers, deepseq , failure, monad-control, network, system-fileio, system-filepath @@ -119832,6 +121275,7 @@ self: { mkDerivation { pname = "url-generic"; version = "0.1"; + revision = "1"; sha256 = "0yfcy2nhc67kxb7n9mjxi4z5jcq4iz4kq80fb9lbi461vijhmw5m"; editedCabalFile = "d9926e2ce6433a73b2ba940d476f7046890752c8a1145b42a78561e8d3ff6fb9"; buildDepends = [ base mtl syb ]; @@ -119987,6 +121431,7 @@ self: { mkDerivation { pname = "usb-hid"; version = "0.1.0.0"; + revision = "1"; sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh"; editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc"; buildDepends = [ attoparsec base bytestring usb ]; @@ -120151,6 +121596,7 @@ self: { mkDerivation { pname = "utf8-string"; version = "0.3.8"; + revision = "2"; sha256 = "1h29dn0scsfkhmkg14ywq9178lw40ah1r36w249zfzqr02y7qxc0"; editedCabalFile = "0555d720026fff65342bdc500391ffd300858b6f2c6db441d4dd1eafbcb599ff"; buildDepends = [ base bytestring ]; @@ -120344,8 +121790,8 @@ self: { ({ mkDerivation, base, diagrams-lib, SVGFonts }: mkDerivation { pname = "uuagc-diagrams"; - version = "0.1.0.0"; - sha256 = "1ai61r0sdi900anwl767v3j1zykgh80m3xqzr05hp6k16d0j38ms"; + version = "0.1.1.0"; + sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz"; buildDepends = [ base diagrams-lib SVGFonts ]; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; @@ -120366,17 +121812,18 @@ self: { }) {}; "uuid" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash, deepseq - , hashable, HUnit, network-info, QuickCheck, random, test-framework + ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit + , network-info, QuickCheck, random, test-framework , test-framework-hunit, test-framework-quickcheck2, time + , uuid-types }: mkDerivation { pname = "uuid"; - version = "1.3.8"; - sha256 = "077q6772xlyhq721r9pxmb458camh5d56wmxv3ankk1j5mv431b6"; + version = "1.3.9"; + sha256 = "1ngajcmg0sxj67qq9h4lfcvgazx1bbzq3y8zhqb6vb3vw6vwmcny"; buildDepends = [ - base binary bytestring cryptohash deepseq hashable network-info - random time + base binary bytestring cryptohash network-info random time + uuid-types ]; testDepends = [ base bytestring HUnit QuickCheck random test-framework @@ -120421,12 +121868,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uuid-types" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit + , QuickCheck, random, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "uuid-types"; + version = "1.0.0"; + sha256 = "09djqdbfd7a5fqarw38r4rrm9bq51f5a664g8hvk9190bwlsyvlq"; + buildDepends = [ base binary bytestring deepseq hashable random ]; + testDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "https://github.com/aslatter/uuid"; + description = "Type definitions for Universally Unique Identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uulib" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "uulib"; - version = "0.9.16"; - sha256 = "06d9i712flxj62j7rdxvy9b0ximhdfvdakwpmr886l6fi3xpajl3"; + version = "0.9.17"; + sha256 = "1rwfnq4xwkbh4xdphbqc86fischld476qnq3868mgr1csmzc04gf"; buildDepends = [ base ghc-prim ]; homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Haskell Utrecht Tools Library"; @@ -120438,6 +121904,7 @@ self: { mkDerivation { pname = "uvector"; version = "0.1.1.1"; + revision = "1"; sha256 = "1psbdsq20nr28cr9ni2mwzwkpz3p20n1xqp0m0m9qafz66d2vi08"; editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508"; buildDepends = [ base ghc-prim ]; @@ -120838,14 +122305,14 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.3"; - sha256 = "0zswcrd65dv8mnifh3h5hr1bmysc7mlqyyi4viln1is08daramzz"; + version = "0.2.4"; + sha256 = "1dfdfcvq6554dxda1h2mnl1ggm39k8w779836v3dwpi0wnq4x249"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers ]; homepage = "http://github.com/dmbarbour/haskell-vcache"; - description = "large, persistent, memcached values and structure sharing for Haskell"; + description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -120964,6 +122431,7 @@ self: { mkDerivation { pname = "vect-floating-accelerate"; version = "0.1.0.4"; + revision = "1"; sha256 = "10mn2gvpkp14j7rc7cc66x30k7xh56xpp04ak1aj8p46rsy75s4x"; editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216"; buildDepends = [ accelerate base vect-floating ]; @@ -121003,8 +122471,8 @@ self: { }: mkDerivation { pname = "vector"; - version = "0.10.12.2"; - sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"; + version = "0.10.12.3"; + sha256 = "16p8i0gvc9d4n9mxlhlnvrl2s0gmgd7kcsk5czdzz2cd4gh5qxhg"; buildDepends = [ base deepseq ghc-prim primitive ]; testDepends = [ base QuickCheck random template-haskell test-framework @@ -121021,8 +122489,8 @@ self: { }: mkDerivation { pname = "vector-algorithms"; - version = "0.6.0.3"; - sha256 = "1kz4b41y7swad6mbx0g3adc8lqma8pl3rnzah71cfdvb87gssbn4"; + version = "0.6.0.4"; + sha256 = "09f0kds50xa0r2l837gqarzazvlhx2afvvykkqiwjqma9caj52av"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring mtl mwc-random primitive vector ]; @@ -121060,12 +122528,11 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-buffer"; - version = "0.4"; - sha256 = "00dr9fm91q091jv19b0fpzjq297fhh7b5xmpyypm26pkzzb7vqz7"; + version = "0.4.1"; + sha256 = "16zxc2d25qd15nankhc974ax7q3y72mg5a77v5jsfrw291brnnlv"; buildDepends = [ base deepseq vector ]; description = "A buffer compatible with Data.Vector.*"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-bytestring" = callPackage @@ -121340,15 +122807,15 @@ self: { }) {}; "verilog" = callPackage - ({ mkDerivation, alex, array, base, happy, monadLib }: + ({ mkDerivation, alex, array, base, happy }: mkDerivation { pname = "verilog"; - version = "0.0.9"; - sha256 = "0i7jc3lriy0ad4ixkf7lj7yis9lzs9j3wh5la7rlawvfq8hj0sag"; - buildDepends = [ array base monadLib ]; + version = "0.0.11"; + sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46"; + buildDepends = [ array base ]; buildTools = [ alex happy ]; homepage = "http://github.com/tomahawkins/verilog"; - description = "Verilog parser and DSL"; + description = "Verilog preprocessor, parser, and AST"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -121648,14 +123115,14 @@ self: { }: mkDerivation { pname = "vivid"; - version = "0.1.0.1"; - sha256 = "15l36rfazqaz1ng1nf5bs6yai4qlcia5lalqwsj0bh526xjd1y82"; - editedCabalFile = "85cc767be7d6265ce51587d0e2eda19066f2e7ae580eced0378684db8c0b4426"; + version = "0.1.0.3"; + revision = "1"; + sha256 = "034kjk2lxfbb4hd8z1axccz9alfkm76mpgw39nisvxngjs6si158"; + editedCabalFile = "de2442ab5d53f8044c99cd0489281bf902ef6615028be780e0df937ae60266da"; buildDepends = [ base binary bytestring containers deepseq hashable mtl network split stm ]; - jailbreak = true; description = "Sound synthesis with SuperCollider"; license = "GPL"; }) {}; @@ -121901,8 +123368,8 @@ self: { }: mkDerivation { pname = "wai-app-file-cgi"; - version = "3.0.4"; - sha256 = "1f6dqlcxzw9m3flv9f14l0qgwhz2ywvn4i1hycywsvbdsj5ja4vh"; + version = "3.0.5"; + sha256 = "0ba0q8kr2sfw4ngvm3a4k7izvfpzjwch16mi410w84ax4nk6chz1"; buildDepends = [ array attoparsec attoparsec-conduit base blaze-builder blaze-html bytestring case-insensitive conduit conduit-extra containers @@ -122038,8 +123505,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.4.6"; - sha256 = "0vl6f2by245fg5sfbzj27zb5mmskqj2h4a68rhwdb8w7gsl2mxz5"; + version = "3.0.5"; + sha256 = "1z4ifsldm1j6kf7jnbq8j4pk39f5d51yrygaxfs1m3mnnvr8xl52"; buildDepends = [ ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers data-default-class deepseq directory @@ -122226,6 +123693,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-lens" = callPackage + ({ mkDerivation, base, bytestring, http-types, lens, network, text + , vault, wai + }: + mkDerivation { + pname = "wai-lens"; + version = "0.1"; + sha256 = "05vd7pjw6jgbb11yln4h2lbyr5pr471040p51pj7iy2m65s42v4x"; + buildDepends = [ + base bytestring http-types lens network text vault wai + ]; + homepage = "https://github.com/webcrank/wai-lens"; + description = "Lenses for WAI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-lite" = callPackage ({ mkDerivation, base, bytestring, conduit, http-types, text , transformers, wai, wai-extra @@ -122250,8 +123733,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.2.3"; - sha256 = "0ljpzq3yfiz3xfglvj69jdk46lmgsg6nqncv9mhij4ih6qq0cx0w"; + version = "2.2.4"; + sha256 = "0l7jd3fczn1hp5d7bbhkk0qflw320sr2yw9gb10jvsv42rs1kdbv"; buildDepends = [ auto-update base blaze-builder byteorder bytestring case-insensitive easy-file fast-logger http-types network unix @@ -122338,6 +123821,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-consul" = callPackage + ({ mkDerivation, async, base, base-prelude, bytestring, conduit + , conduit-extra, consul-haskell, enclosed-exceptions, http-client + , http-types, monad-control, monad-logger, network, process + , resourcet, text, transformers, void, wai, wai-app-static + , wai-conduit, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-consul"; + version = "0.1.0.2"; + sha256 = "0qq7kilp9a4qjja337saqccn250s6mnf3n80sgyg935hy1dmm7fq"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + async base base-prelude bytestring conduit conduit-extra + consul-haskell enclosed-exceptions http-client http-types + monad-control monad-logger network process resourcet text + transformers void wai wai-app-static wai-conduit wai-extra warp + ]; + homepage = "https://github.com/fpco/wai-middleware-consul"; + description = "Wai Middleware for Consul"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -122833,8 +124341,8 @@ self: { }: mkDerivation { pname = "warp"; - version = "3.0.10"; - sha256 = "07xzc8m662zp14pqfmygjzpkafdklf776xc5ihsnqaxym7wpajds"; + version = "3.0.10.1"; + sha256 = "1v3fffc12psj22p3b98ax1q7gx4v3z75sl68g9b7gj5hgnb2jaxh"; buildDepends = [ array auto-update base blaze-builder bytestring case-insensitive ghc-prim hashable http-date http-types iproute network @@ -123327,8 +124835,10 @@ self: { }: mkDerivation { pname = "web-routing"; - version = "0.6.0"; - sha256 = "0zs4znmg34d4q14v14h07k48921xan69wrp27xjza5kp6nmqy58w"; + version = "0.6.1"; + revision = "1"; + sha256 = "0lz81mdc0a2i1jpra1c7v1pva9nff2b35cm5snllnpkb7r898vgr"; + editedCabalFile = "5dec5fad0ea8297fe885bc149a175cf94765f668d3e698b4c5bc547f75ca5f7f"; buildDepends = [ base bytestring primitive text types-compat unordered-containers ]; @@ -123338,6 +124848,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webcrank" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, either, exceptions, http-date, http-media + , http-types, lens, mtl, network-uri, QuickCheck, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "webcrank"; + version = "0.1"; + revision = "1"; + sha256 = "00jnarj4s9jsb7g03jazabpvnnscz7385yslyvvj9z2qryxwv9xk"; + editedCabalFile = "f4521a187e8f4fca8752ab6e53c38df6cafbdc2002397c521928ad69765c1864"; + buildDepends = [ + attoparsec base blaze-builder bytestring case-insensitive either + exceptions http-date http-media http-types lens mtl network-uri + semigroups text transformers unordered-containers utf8-string + ]; + testDepends = [ + attoparsec base bytestring case-insensitive either exceptions + http-date http-media http-types lens mtl QuickCheck tasty + tasty-hunit tasty-quickcheck unordered-containers + ]; + homepage = "https://github.com/webcrank/webcrank.hs"; + description = "Webmachine inspired toolkit for building http applications and services"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "webcrank-dispatch" = callPackage ({ mkDerivation, base, bytestring, mtl, path-pieces, reroute, text , unordered-containers @@ -123412,6 +124951,7 @@ self: { mkDerivation { pname = "webdriver-snoy"; version = "0.6.0.4"; + revision = "1"; sha256 = "02c2ihqk5gsgnv61rj14rdd76r2nhmxacml3z9krrgxgn326hrbk"; editedCabalFile = "7cc952e84c8ff09b8d032df7d8089bd4d5167b32834bda67c79c62a34b12d52a"; buildDepends = [ @@ -123514,7 +125054,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -123530,7 +125069,6 @@ self: { pkgconfigDepends = [ webkit ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) webkit;}; "webpage" = callPackage @@ -123577,6 +125115,7 @@ self: { homepage = "https://github.com/jrb/websnap"; description = "Transforms URLs to PNGs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets" = callPackage @@ -123587,8 +125126,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.9.3.0"; - sha256 = "0aq0mbfi1sh55z46pcy3g0n3zjqw176pah4zny0nk8l3gl8ss7v1"; + version = "0.9.3.1"; + sha256 = "0yqq2jj22a17n0cqcd54f0a7vjwwak2zr3wybbh1iq6gz0p5qf76"; buildDepends = [ attoparsec base base64-bytestring binary blaze-builder bytestring case-insensitive containers entropy mtl network random SHA text @@ -123661,6 +125200,7 @@ self: { mkDerivation { pname = "wedged"; version = "0"; + revision = "1"; sha256 = "1sdnqc40qg5pv0kj4qw33vk5cy3yym60csh3iwmpm7pzpray7511"; editedCabalFile = "64bac15c983cf83ab2b05b002439b8f125b9c942ae46ed75a187f7e2dc68dba5"; isLibrary = false; @@ -123710,6 +125250,7 @@ self: { mkDerivation { pname = "welshy"; version = "0.1.0.0"; + revision = "1"; sha256 = "08pgns5irmvh9c12lxq2x72ql8ggzd3npfqnrphba3l171380gki"; editedCabalFile = "ff6973a67b742efb8d7c1d542ba9f27056de3e547ade96d33e9b68314afec22c"; buildDepends = [ @@ -123827,6 +125368,7 @@ self: { mkDerivation { pname = "whois"; version = "1.2.2"; + revision = "1"; sha256 = "199fd710zicx7ijyvipc7p0d3yg18f6nppcln2wz38hl9kfv0iv0"; editedCabalFile = "c11f42da958683ffb7a2e958dcefe2ef1a3e732732010f44facfbb0fffd7571e"; buildDepends = [ base network network-uri split ]; @@ -123942,8 +125484,8 @@ self: { }: mkDerivation { pname = "witherable"; - version = "0.1.2.1"; - sha256 = "1f3dr6dml0lpqrpzr601isfb9jzii5mlqdc240fbail8xb09gf52"; + version = "0.1.2.2"; + sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7"; buildDepends = [ base containers hashable transformers unordered-containers vector ]; @@ -123984,8 +125526,8 @@ self: { }: mkDerivation { pname = "wizards"; - version = "1.0.1"; - sha256 = "08dn24injfzvhs34yw39y336pyi6p98bdrafx3lhd6lcbp531sca"; + version = "1.0.2"; + sha256 = "02yk9d01d39c3hpvlh2c6v35fzyf3nm92f6vff0qns30dmr2r8ab"; buildDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -124726,6 +126268,7 @@ self: { mkDerivation { pname = "x11-xim"; version = "0.0.9.0"; + revision = "1"; sha256 = "0sn789j0kz891l9p0srx6537yq44b5jlyph9vc3xdb3ygy20bjrw"; editedCabalFile = "4404aa037f4df2ef8cd16834c8149d596f09b30379f0b85a3b8db9ddd30fa6b0"; buildDepends = [ base utf8-string X11 ]; @@ -124902,8 +126445,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "0.2.1"; - sha256 = "1630c38glbfljw18822xmznwfa48sng1wvjzy5gjyjk9165skzig"; + version = "0.2.2"; + sha256 = "1h8rnpgzicn46i4narvmjgh4r46q90ch5wgwmxknksnqi55c7gs4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125049,7 +126592,6 @@ self: { homepage = "https://github.com/aslatter/xhb"; description = "X Haskell Bindings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xhb-atom-cache" = callPackage @@ -125222,7 +126764,6 @@ self: { testDepends = [ base blaze-markup bytestring old-locale text time zip-archive ]; - jailbreak = true; description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -125461,6 +127002,7 @@ self: { mkDerivation { pname = "xml-html-conduit-lens"; version = "0.3.2.1"; + revision = "1"; sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; editedCabalFile = "b525d68eb964e306dc6fab3f9ba89e2325d91af53469ad32ec1d49e5f9a80647"; buildDepends = [ @@ -125475,14 +127017,18 @@ self: { }) {}; "xml-lens" = callPackage - ({ mkDerivation, base, containers, lens, text, xml-conduit }: + ({ mkDerivation, base, case-insensitive, containers, lens, text + , xml-conduit + }: mkDerivation { pname = "xml-lens"; - version = "0.1.6.2"; - sha256 = "14x3xz4rydl8x7ddznz90n3z5csy12c7l0r7bms8s7yqv4qzf6hz"; - buildDepends = [ base containers lens text xml-conduit ]; + version = "0.1.6.3"; + sha256 = "1s5ivi3caz56g5yyg3pharshs3wcygcssjx1sm9aw4mv3ylz3msd"; + buildDepends = [ + base case-insensitive containers lens text xml-conduit + ]; homepage = "https://github.com/fumieval/xml-lens"; - description = "Lenses, traversals, prisms for xml-conduit"; + description = "Lenses, traversals, and prisms for xml-conduit"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -125582,21 +127128,20 @@ self: { "xml-to-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, curl - , directory, hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup - , process, regex-posix, tagsoup, text, unordered-containers, vector + , hashable, hxt, hxt-curl, hxt-expat, hxt-tagsoup, regex-posix + , tagsoup, text, unordered-containers, vector }: mkDerivation { pname = "xml-to-json"; - version = "1.0.1"; - sha256 = "098crnwdq96rzb0ixy1s5krbabfgc36dnxr1ygav3fpqr16ndrng"; + version = "2.0.1"; + sha256 = "0brfdlarr4yyfsfawkfjdbk4z3lvi9ihkhvqh5ws2ll0h80ja6md"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base bytestring containers curl directory hashable hxt - hxt-curl hxt-expat hxt-tagsoup process regex-posix tagsoup text - unordered-containers vector + aeson base bytestring containers curl hashable hxt hxt-curl + hxt-expat hxt-tagsoup regex-posix tagsoup text unordered-containers + vector ]; - jailbreak = true; homepage = "https://github.com/sinelaw/xml-to-json"; description = "Library and command line tool for converting XML files to json"; license = stdenv.lib.licenses.mit; @@ -125606,8 +127151,8 @@ self: { ({ mkDerivation, base, directory, process, tagsoup, text }: mkDerivation { pname = "xml-to-json-fast"; - version = "1.0.1"; - sha256 = "1gp32adky7pjspppkzz01rj3lpl2b8fvaqf7fg3j0p3cmlbhap7m"; + version = "2.0.0"; + sha256 = "0gsn8wdiwmvr7nvxbfj9vpzlxwdh8m9lprx2hxnkrnslmbhjz1fx"; isLibrary = true; isExecutable = true; buildDepends = [ base directory process tagsoup text ]; @@ -125712,6 +127257,7 @@ self: { mkDerivation { pname = "xmlhtml"; version = "0.2.3.4"; + revision = "1"; sha256 = "0cv5jqzbq7mi5lcrnaxr5qaprp8biv1jlyzpjhwnwqzla6fqamfr"; editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; buildDepends = [ @@ -125805,9 +127351,8 @@ self: { }: mkDerivation { pname = "xmonad"; - version = "0.11"; - sha256 = "1nsv88y2b206n3s5hrsp5ginvz1bj818ns7jmikavb2g33akdgg5"; - editedCabalFile = "e9b49b3835d57df793f01d2e4f6f32ce9b2478ba6fce8503b0e4e80c57807f0b"; + version = "0.11.1"; + sha256 = "1pfjssamiwpwjp1qqkm9m9p9s35pv381m0cwg6jxg0ppglibzq1r"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -125851,8 +127396,8 @@ self: { }: mkDerivation { pname = "xmonad-contrib"; - version = "0.11.3"; - sha256 = "14h9vr33yljymswj50wbimav263y9abdcgi07mvfis0zd08rxqxa"; + version = "0.11.4"; + sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3"; buildDepends = [ base containers directory extensible-exceptions mtl old-locale old-time process random unix utf8-string X11 X11-xft xmonad @@ -126077,7 +127622,6 @@ self: { homepage = "http://ianwookim.org/hoodle"; description = "Xournal file parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xournal-render" = callPackage @@ -126241,6 +127785,7 @@ self: { mkDerivation { pname = "xxhash"; version = "0.0.1"; + revision = "1"; sha256 = "0crmvkvk2604a06jjsn613bxx0n1lv59picl2656rx2pc7wbyidn"; editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274"; buildDepends = [ base bytestring crypto-api tagged ]; @@ -126619,6 +128164,7 @@ self: { mkDerivation { pname = "yaop"; version = "0.1.2.1"; + revision = "1"; sha256 = "0z66ffxb89bksgqfji9x8msch9yk7nmbzm2qrcn5j3w4ylg7dpdr"; editedCabalFile = "5333f04af0a27a0197004dc2e686dbbf29e5e2dc248277eb2afcb7587092a55c"; buildDepends = [ base mtl template-haskell ]; @@ -126646,7 +128192,9 @@ self: { mkDerivation { pname = "yarr"; version = "1.3.3.3"; + revision = "1"; sha256 = "09nr1k0yhm1sh4g741876sf4vi0mgrh7gdq9cbw33hxn6168h547"; + editedCabalFile = "290dde1a67c1de78074c60796f5326cf01668fb109345cd100ff1ac5a5663687"; buildDepends = [ base deepseq fixed-vector ghc-prim missing-foreign primitive template-haskell @@ -126811,8 +128359,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.4.3.1"; - sha256 = "08kyg83alf1z1c5llr5gbfg827ds1fvyz0d7vicmx6fzl1m9nkzb"; + version = "1.4.4"; + sha256 = "079ny0jdg68kxdp117y1av0d09fhpywbb8v9iyl867vswpb38b08"; buildDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup byteable bytestring conduit @@ -126932,8 +128480,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.4.1.2"; - sha256 = "1qrb160jq5nniwvbv92hbsznxiwdcjbcxb6lcqdkj1ggfbhs3zp8"; + version = "1.4.2.1"; + sha256 = "1gc8049xvzrkqb91fpdrzr54byxag6rkqvb8650q4scpr09vzdpl"; buildDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -127072,32 +128620,33 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, Cabal, conduit, conduit-extra, containers - , data-default-class, directory, file-embed, filepath, fsnotify - , ghc, ghc-paths, http-client, http-conduit, http-reverse-proxy - , http-types, lifted-base, network, optparse-applicative, parsec - , process, project-template, resourcet, shakespeare, split - , streaming-commons, system-fileio, system-filepath, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, yaml - , zlib + ({ mkDerivation, async, attoparsec, base, base64-bytestring + , blaze-builder, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, ghc, ghc-paths, http-client, http-conduit + , http-reverse-proxy, http-types, lifted-base, network + , optparse-applicative, parsec, process, project-template + , resourcet, shakespeare, split, streaming-commons, system-fileio + , system-filepath, tar, template-haskell, text, time, transformers + , transformers-compat, unix-compat, unordered-containers, wai + , wai-extra, warp, warp-tls, yaml, zlib }: mkDerivation { pname = "yesod-bin"; - version = "1.4.5"; - sha256 = "15vw4p0sf1rn7mc27mqcrl3is13dscjax7wm8vyir5hj7i90llx1"; + version = "1.4.6"; + sha256 = "1qr0bdnnmn13vyd6zx9d622lyhdpav9304yhc95fgzxz1cgbdza4"; isLibrary = false; isExecutable = true; buildDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring Cabal - conduit conduit-extra containers data-default-class directory + async attoparsec base base64-bytestring blaze-builder bytestring + Cabal conduit conduit-extra containers data-default-class directory file-embed filepath fsnotify ghc ghc-paths http-client http-conduit http-reverse-proxy http-types lifted-base network optparse-applicative parsec process project-template resourcet shakespeare split streaming-commons system-fileio system-filepath tar template-haskell text time transformers transformers-compat - unix-compat unordered-containers wai wai-extra warp yaml zlib + unix-compat unordered-containers wai wai-extra warp warp-tls yaml + zlib ]; homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; @@ -127160,8 +128709,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.8.3"; - sha256 = "0k49s9cybr36knmx2lwapivszcq6xg67vpx5fw812dzv8x2cj714"; + version = "1.4.9"; + sha256 = "10rf7xrb0zrqpiv8149z52h1jx4nr96ajs2pxdr9avazprls9jmb"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -127309,7 +128858,6 @@ self: { homepage = "https://github.com/fpco/yesod-fay"; description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-fb" = callPackage @@ -127477,7 +129025,6 @@ self: { base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare texmath text xss-sanitize yesod-core yesod-form ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-markdown"; description = "Tools for using markdown in a yesod application"; license = stdenv.lib.licenses.gpl2; @@ -127677,20 +129224,19 @@ self: { "yesod-purescript" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , formatting, fsnotify, purescript, regex-tdfa, regex-tdfa-text - , shakespeare, system-fileio, system-filepath, template-haskell - , text, time, transformers, yesod-core + , formatting, fsnotify, mtl, purescript, regex-tdfa + , regex-tdfa-text, shakespeare, system-fileio, system-filepath + , template-haskell, text, time, transformers, yesod-core }: mkDerivation { pname = "yesod-purescript"; - version = "0.0.4.7"; - sha256 = "0x2mbc4ra6cn3jz3lsb0q40bwz1j7il2nly97m52n4nr18pw4fp9"; + version = "0.0.5"; + sha256 = "0arij86cfzy5hh82gc5l4i3s3z4qa9rfrnj9nrp6q25qhvgiclmy"; buildDepends = [ aeson base bytestring containers data-default formatting fsnotify - purescript regex-tdfa regex-tdfa-text shakespeare system-fileio + mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio system-filepath template-haskell text time transformers yesod-core ]; - jailbreak = true; homepage = "https://github.com/mpietrzak/yesod-purescript"; description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; @@ -127722,6 +129268,7 @@ self: { mkDerivation { pname = "yesod-routes"; version = "1.2.0.7"; + revision = "1"; sha256 = "00i2nysbhmxnq0dvfdjx6nhxy680ya38nx8gcgm13fv2xwdd2p6j"; editedCabalFile = "0d622fd91f5c82a3ae54849a9f55e15b39dcc6240f9f2119151362255cd7334e"; buildDepends = [ @@ -128051,8 +129598,8 @@ self: { }: mkDerivation { pname = "yet-another-logger"; - version = "0.1.1"; - sha256 = "0h6cszsjffp4crkavr74lfna847pxc506nrqcw108awyjji803by"; + version = "0.1.1.1"; + sha256 = "0bwslcxb747krvpa4irnych4ddjik51542jf0bkzsyhagmakrjz8"; buildDepends = [ aeson ansi-terminal async base base-unicode-symbols bytestring case-insensitive configuration-tools deepseq either @@ -128521,7 +130068,6 @@ self: { homepage = "http://bitbucket.org/iago/z3-haskell"; description = "Bindings for the Z3 Theorem Prover"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) { gomp = null; inherit (pkgs) z3;}; "zampolit" = callPackage @@ -128876,7 +130422,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming compression/decompression via conduits. (deprecated)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zlib-enum" = callPackage @@ -129078,6 +130623,7 @@ self: { mkDerivation { pname = "zot"; version = "0.0.2"; + revision = "1"; sha256 = "12wgkrlvhby0gy6kngjwyx468yarpgkiwy51v6zb8jhx79mhidq3"; editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40"; isLibrary = false; diff --git a/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch b/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch new file mode 100644 index 00000000000..c3df98043b3 --- /dev/null +++ b/pkgs/development/haskell-modules/haskell-src-meta-ghc710.patch @@ -0,0 +1,55 @@ +From 24e6f45408083745080ff2f3710f58209041113c Mon Sep 17 00:00:00 2001 +From: Luite Stegeman <stegeman@gmail.com> +Date: Sun, 28 Dec 2014 21:33:22 +0100 +Subject: [PATCH] updates for GHC 7.10 and Template Haskell 2.10 + +--- + haskell-src-meta.cabal | 4 ++-- + src/Language/Haskell/Meta/Syntax/Translate.hs | 6 ++++++ + src/Language/Haskell/Meta/Utils.hs | 5 ++++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs +index 189d32e..36a08f1 100644 +--- a/src/Language/Haskell/Meta/Syntax/Translate.hs ++++ b/src/Language/Haskell/Meta/Syntax/Translate.hs +@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b + toCxt :: Hs.Context -> Cxt + toCxt = fmap toPred + where ++#if MIN_VERSION_template_haskell(2,10,0) ++ toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts) ++ toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2]) ++ toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2]) ++#else + toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts) + toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2]) + toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2) ++#endif + toPred a@Hs.IParam{} = noTH "toCxt" a + + foldAppT :: Type -> [Type] -> Type +diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs +index 36f7e96..d194f3e 100644 +--- a/src/Language/Haskell/Meta/Utils.hs ++++ b/src/Language/Haskell/Meta/Utils.hs +@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) = + unVarT (VarT n) = PlainTV n + renamePreds = renameThings renamePred + ++#if MIN_VERSION_template_haskell(2,10,0) ++ renamePred = renameT ++#else + renamePred env new (ClassP n ts) = let + (ts', env', new') = renameTs env new [] ts + in (ClassP (normaliseName n) ts', env', new') +@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) = + (t1', env1, new1) = renameT env new t1 + (t2', env2, new2) = renameT env1 new1 t2 + in (EqualP t1' t2', env2, new2) +- ++#endif + + -- | Remove qualification, etc. + normaliseName :: Name -> Name + diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 323030f1eaf..8f932c87023 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -55,4 +55,7 @@ rec { appendPatch = drv: x: appendPatches drv [x]; appendPatches = drv: xs: overrideCabal drv (drv: { patches = (drv.patches or []) ++ xs; }); + doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); + dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + } diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 763164cec87..30035671a32 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -1,7 +1,9 @@ -{ stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }: +{ stdenv, lib, ghc, llvmPackages, packages, buildEnv +, makeWrapper +, ignoreCollisions ? false, withLLVM ? false }: # This wrapper works only with GHC 6.12 or later. -assert stdenv.lib.versionOlder "6.12" ghc.version; +assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs; # It's probably a good idea to include the library "ghc-paths" in the # compiler environment, because we have a specially patched version of @@ -25,15 +27,22 @@ assert stdenv.lib.versionOlder "6.12" ghc.version; # fi let - ghc761OrLater = stdenv.lib.versionOlder "7.6.1" ghc.version; + isGhcjs = ghc.isGhcjs or false; + ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version; packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf"; - libDir = "$out/lib/ghc-${ghc.version}"; + ghcCommand = if isGhcjs then "ghcjs" else "ghc"; + libDir = "$out/lib/${ghcCommand}-${ghc.version}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = stdenv.lib.filter (x: x ? isHaskellLibrary) (stdenv.lib.closePropagation packages); - hasLibraries = stdenv.lib.any (x: x.isHaskellLibrary) paths; + paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); + hasLibraries = lib.any (x: x.isHaskellLibrary) paths; + # CLang is needed on Darwin for -fllvm to work: + # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/code-generators.html + llvm = lib.makeSearchPath "bin" + ([ llvmPackages.llvm ] + ++ lib.optional stdenv.isDarwin llvmPackages.clang); in -if paths == [] then ghc else +if paths == [] && !withLLVM then ghc else buildEnv { inherit (ghc) name; paths = paths ++ [ghc]; @@ -41,6 +50,10 @@ buildEnv { postBuild = '' . ${makeWrapper}/nix-support/setup-hook + ${lib.optionalString isGhcjs '' + cp -r "${ghc}/${ghc.libDir}/"* ${libDir}/ + ''} + if test -L "$out/bin"; then binTarget="$(readlink -f "$out/bin")" rm "$out/bin" @@ -50,31 +63,32 @@ buildEnv { for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags '"-B$NIX_GHC_LIBDIR"' \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ - --set "NIX_GHC_LIBDIR" "${libDir}" + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags '"-B$NIX_GHC_LIBDIR"' \ + --set "NIX_GHC" "$out/bin/${ghcCommand}" \ + --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ + --set "NIX_GHC_LIBDIR" "${libDir}" \ + ${lib.optionalString withLLVM ''--prefix "PATH" ":" "${llvm}"''} done for prg in runghc runhaskell; do rm -f $out/bin/$prg - makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ - --add-flags "-f $out/bin/ghc" \ - --set "NIX_GHC" "$out/bin/ghc" \ - --set "NIX_GHCPKG" "$out/bin/ghc-pkg" \ - --set "NIX_GHC_DOCDIR" "${docDir}" \ + makeWrapper ${ghc}/bin/$prg $out/bin/$prg \ + --add-flags "-f $out/bin/ghc" \ + --set "NIX_GHC" "$out/bin/${ghcCommand}" \ + --set "NIX_GHCPKG" "$out/bin/${ghcCommand}-pkg" \ + --set "NIX_GHC_DOCDIR" "${docDir}" \ --set "NIX_GHC_LIBDIR" "${libDir}" done - for prg in ghc-pkg ghc-pkg-${ghc.version}; do + for prg in ${ghcCommand}-pkg ${ghcCommand}-pkg-${ghc.version}; do rm -f $out/bin/$prg makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "${packageDBFlag}=${packageCfgDir}" done - ${stdenv.lib.optionalString hasLibraries "$out/bin/ghc-pkg recache"} - $out/bin/ghc-pkg check + ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + $out/bin/${ghcCommand}-pkg check ''; } // { preferLocalBuild = true; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 3668fedf051..4c064a42ebf 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,42 +1,16 @@ -x@{builderDefsPackage - , readline - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="j"; - version="701_b"; - name="${baseName}-${version}"; - url="http://www.jsoftware.com/download/${baseName}${version}_source.tar.gz"; - hash="1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; +{ stdenv, fetchurl, readline }: + +stdenv.mkDerivation rec { + name = "j-${version}"; + version = "701_b"; + src = fetchurl { + url = "http://www.jsoftware.com/download/j${version}_source.tar.gz"; + sha256 = "1gmjlpxcd647x690c4dxnf8h6ays8ndir6cib70h3zfnkrc34cys"; }; + buildInputs = [ readline ]; + bits = if stdenv.is64bit then "64" else "32"; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doBuildJ" "doDeploy"]; - - bits = if a.stdenv.is64bit then - "64" - else if a.stdenv.isi686 then - "32" - else - builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; - - doBuildJ = a.fullDepEntry '' + buildPhase = '' sed -i bin/jconfig -e ' s@bits=32@bits=${bits}@g; s@readline=0@readline=1@; @@ -51,36 +25,28 @@ rec { sh -o errexit bin/build_defs sh -o errexit bin/build_tsdll - sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; + sed -i j/bin/profile.ijs -e " + s@userx=[.] *'.j'@userx=. '/.j'@; s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ; /install=./ainstall=. install,'/share/j' - " - '' ["doUnpack" "addInputs" "minInit"]; + " + ''; - doDeploy = a.fullDepEntry '' + installPhase = '' mkdir -p "$out" cp -r j/bin "$out/bin" rm "$out/bin/profilex_template.ijs" - + mkdir -p "$out/share/j" cp -r docs j/addons j/system "$out/share/j" - '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"]; - - meta = { + ''; + + meta = with stdenv.lib; { description = "J programming language, an ASCII-based APL successor"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - unix; - license = a.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; + license = licenses.gpl3Plus; + homepage = http://jsoftware.com/; }; - passthru = { - updateInfo = { - downloadPage = "http://jsoftware.com/source.htm"; - }; - }; -}) x - +} diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 2a8f7ca2c30..03c836d9251 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -1,50 +1,21 @@ -x@{builderDefsPackage - , fetchgit - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["fetchgit"]; +{ stdenv, fetchurl }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - srcDrv = a.fetchgit { - url = "https://github.com/kevinlawler/kona.git"; - inherit rev; - sha256 = "a8189c94fca3e62a740eb6823ab3fc571c0960ff5e7a3eb0353e5cf36ef9fdcb"; - }; - - src = "${srcDrv}/"; - - rev = "81e95b395144f4b02fe8782ad87c1f218b511c43"; - version = "git-${rev}"; +stdenv.mkDerivation rec { name = "kona-${version}"; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["prepareOut" "doMakeInstall"]; - makeFlags = ["PREFIX=\$out"]; + version = "3.21"; + src = fetchurl { + url = "https://github.com/kevinlawler/kona/archive/Win.${version}-64.tar.gz"; + sha256 = "0c1yf3idqkfq593xgqb25r2ykmfmp83zzh3q7kb8095a069gvri3"; + }; - prepareOut = a.fullDepEntry '' - mkdir -p "$out/bin" - '' ["minInit" "defEnsureDir"]; + makeFlags = "PREFIX=$(out)"; + preInstall = ''mkdir -p "$out/bin"''; - meta = { + meta = with stdenv.lib; { description = "An interpreter of K, APL-like programming language"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.free; - }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/kevinlawler/kona"; - }; + homepage = https://github.com/kevinlawler/kona/; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.all; + license = licenses.isc; }; -}) x +} diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 49740fddb46..6796a195286 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.38"; + version = "5.4.39"; name = "php-${version}"; @@ -87,13 +87,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -103,8 +103,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { @@ -258,7 +258,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "121ybn55c9f65r1mwiy4yks67bb6m5m5zwwx9y0vpjddryq7vwxb"; + sha256 = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix index fac04654847..87aff4ff1a2 100644 --- a/pkgs/development/interpreters/php/5.5.nix +++ b/pkgs/development/interpreters/php/5.5.nix @@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix index 6559ecfa658..1fa98708920 100644 --- a/pkgs/development/interpreters/php/5.6.nix +++ b/pkgs/development/interpreters/php/5.6.nix @@ -90,13 +90,13 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; + configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"]; + buildInputs = [ mysql.lib ]; }; mysqli_embedded = { @@ -106,8 +106,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; + configureFlags = ["--with-pdo-mysql=${mysql.lib}"]; + buildInputs = [ mysql.lib ]; }; bcmath = { diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index bfa47693de0..2860aceb383 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { baseName="pure"; project="pure-lang"; - version="0.63"; + version="0.64"; name="${baseName}-${version}"; extension="tar.gz"; src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="33acb2d560b21813f5e856973b493d9cfafba82bd6f539425ce07aa22f84ee29"; + sha256="01vvix302gh5vsmnjf2g0rrif3hl1yik4izsx1wrvv1a6hlm5mgg"; }; buildInputs = [ bison flex makeWrapper ]; @@ -36,4 +36,4 @@ stdenv.mkDerivation rec { linux; license = lib.licenses.gpl3Plus; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 0d7490d910c..8b24fe00463 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: +{ stdenv, fetchurl, self, callPackage +, bzip2, openssl + +, includeModules ? false + +, db, gdbm, ncurses, sqlite, readline + +, tcl ? null, tk ? null, x11 ? null, libX11 ? null, x11Support ? true +, zlib ? null, zlibSupport ? true +}: assert zlibSupport -> zlib != null; +assert x11Support -> tcl != null + && tk != null + && x11 != null + && libX11 != null; with stdenv.lib; @@ -28,7 +40,7 @@ let # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch ]; - + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do @@ -48,7 +60,11 @@ let buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] + [ bzip2 openssl ] + ++ optionals includeModules ( + [ db gdbm ncurses sqlite readline + ] ++ optionals x11Support [ tcl tk x11 libX11 ] + ) ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have @@ -87,7 +103,7 @@ let ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} paxmark E $out/bin/python${majorVersion} - + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; @@ -192,11 +208,15 @@ let deps = [ sqlite ]; }; + } // optionalAttrs x11Support { + tkinter = buildInternalPythonModule { moduleName = "tkinter"; deps = [ tcl tk x11 libX11 ]; }; + } // { + readline = buildInternalPythonModule { moduleName = "readline"; internalName = "readline"; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index e788e1ad13d..dc9323f40ef 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,19 +2,19 @@ stdenv.mkDerivation rec { name = "rakudo-star-${version}"; - version = "2014.04"; + version = "2015.03"; src = fetchurl { url = "http://rakudo.org/downloads/star/${name}.tar.gz"; - sha256 = "0spdrxc2kiidpgni1vl71brgs4d76h8029w5jxvah3yvjcqixz7l"; + sha256 = "1fwvmjyc1bv3kq7p25xyl4sqinp19mbrspmf0h7rvxlwnfcrr5mv"; }; buildInputs = [ icu zlib gmp readline jdk perl ]; configureScript = "perl ./Configure.pl"; configureFlags = - [ "--gen-moar" + [ "--backends=moar,jvm" + "--gen-moar" "--gen-nqp" - "--gen-parrot" ]; meta = { diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index eba2a0b0a10..cadda288764 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -25,7 +25,7 @@ let v8 = v8_3_16_14; - mysql = (import <nixpkgs> {}).mysql; + mysql = assert false; (import <nixpkgs> {}).mysql; in @@ -57,7 +57,7 @@ in }; mysql2 = attrs: { - buildInputs = [ mysql zlib openssl ]; + buildInputs = [ mysql.lib zlib openssl ]; }; ncursesw = attrs: { diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix index 43a5961aa35..35b8823d22a 100644 --- a/pkgs/development/interpreters/ruby/bundler-head.nix +++ b/pkgs/development/interpreters/ruby/bundler-head.nix @@ -5,7 +5,7 @@ buildRubyGem { src = fetchgit { url = "https://github.com/bundler/bundler.git"; rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157"; - sha256 = "1fywz0m3bb0fmcikhqbw9iaw67k29srwi8dllq6ni1cbm1xfyj46"; + sha256 = "0q7cjmz1fsrw3yfsr3h274qjamwnw01xgaqq3h5cjbqlrni4iq7k"; leaveDotGit = true; }; dontPatchShebangs = true; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 3f1fbfcd6a9..6d6148e092a 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -7,7 +7,7 @@ # OSS is no longer supported, for it's much crappier than ALSA and # PulseAudio. -assert !(stdenv ? cross) -> alsaSupport || pulseaudioSupport; +assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; assert openglSupport -> (mesa != null && x11Support); assert x11Support -> (x11 != null && libXrandr != null); @@ -51,6 +51,13 @@ stdenv.mkDerivation rec { "--without-x" ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib"); + # Fix a build failure on OS X Mavericks + # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085 + patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl { + url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320"; + sha1 = "3137feb503a89a8d606405373905b92dcf7e293b"; + }) ]; + crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") { patches = let f = rev: sha256: fetchurl { @@ -72,6 +79,6 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index 2aa122a8fb2..a1d83950477 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/aalib/darwin.patch b/pkgs/development/libraries/aalib/darwin.patch new file mode 100644 index 00000000000..44559d06210 --- /dev/null +++ b/pkgs/development/libraries/aalib/darwin.patch @@ -0,0 +1,106 @@ +diff --git a/src/aaedit.c b/src/aaedit.c +index 09534d2..2ea52f9 100644 +--- a/src/aaedit.c ++++ b/src/aaedit.c +@@ -1,6 +1,6 @@ + #include <string.h> + #include <ctype.h> +-#include <malloc.h> ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + static void aa_editdisplay(struct aa_edit *e) + +diff --git a/src/aakbdreg.c b/src/aakbdreg.c +index def65fe..f4f8efb 100644 +--- a/src/aakbdreg.c ++++ b/src/aakbdreg.c +@@ -1,4 +1,4 @@ +-#include <malloc.h> ++#include <stdlib.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aalib.c b/src/aalib.c +index 11fecc8..e3063b4 100644 +--- a/src/aalib.c ++++ b/src/aalib.c +@@ -1,6 +1,6 @@ + #include <stdio.h> + #include <string.h> +-#include <malloc.h> ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + +diff --git a/src/aamoureg.c b/src/aamoureg.c +index 0380828..bb55fe3 100644 +--- a/src/aamoureg.c ++++ b/src/aamoureg.c +@@ -1,4 +1,4 @@ +-#include <malloc.h> ++#include <stdlib.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aarec.c b/src/aarec.c +index 70f4ebc..ee43e8a 100644 +--- a/src/aarec.c ++++ b/src/aarec.c +@@ -1,5 +1,5 @@ + #include <string.h> +-#include <malloc.h> ++#include <stdlib.h> + #include "aalib.h" + #include "aaint.h" + aa_linkedlist *aa_kbdrecommended = NULL, *aa_mouserecommended = NULL, +diff --git a/src/aaregist.c b/src/aaregist.c +index 54abec0..765155e 100644 +--- a/src/aaregist.c ++++ b/src/aaregist.c +@@ -1,4 +1,4 @@ +-#include <malloc.h> ++#include <stdlib.h> + #include "config.h" + #include "aalib.h" + #include "aaint.h" +diff --git a/src/aax.c b/src/aax.c +index adcbd82..36e3294 100644 +--- a/src/aax.c ++++ b/src/aax.c +@@ -1,4 +1,3 @@ +-#include <malloc.h> + #include <stdlib.h> + #include <string.h> + #include <stdio.h> +diff --git a/src/aaxkbd.c b/src/aaxkbd.c +index 30d5903..da2248d 100644 +--- a/src/aaxkbd.c ++++ b/src/aaxkbd.c +@@ -1,4 +1,3 @@ +-#include <malloc.h> + #include <stdlib.h> + #include <string.h> + #include <stdio.h> +diff --git a/src/aaxmouse.c b/src/aaxmouse.c +index 9935b03..7e725ad 100644 +--- a/src/aaxmouse.c ++++ b/src/aaxmouse.c +@@ -1,4 +1,3 @@ +-#include <malloc.h> + #include <stdlib.h> + #include <string.h> + #include <stdio.h> +diff --git a/aalib.m4 b/aalib.m4 +index c40b8db..991fbda 100644 +--- a/aalib.m4 ++++ b/aalib.m4 +@@ -9,7 +9,7 @@ + dnl AM_PATH_AALIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) + dnl Test for AALIB, and define AALIB_CFLAGS and AALIB_LIBS + dnl +-AC_DEFUN(AM_PATH_AALIB, ++AC_DEFUN([AM_PATH_AALIB], + [dnl + dnl Get the cflags and libraries from the aalib-config script + dnl diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index fa21a9570c7..d7dcbeba330 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { configureFlags = "--without-x --with-ncurses=${ncurses}"; + patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ]; + meta = { description = "ASCII art graphics library"; }; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 416a33b09a2..b562a2e5d3d 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { intltool dbus_glib at_spi2_core libSM ]; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index c27506fe588..7128e4d3f2b 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = with stdenv; lib.optionalString isDarwin "-lintl"; meta = with stdenv.lib; { - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 473df8819c0..f5de02e22bb 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.10"; + name = "babl-0.1.12"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4"; + url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; + sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g"; }; meta = { diff --git a/pkgs/development/libraries/cl-ppcre/default.nix b/pkgs/development/libraries/cl-ppcre/default.nix deleted file mode 100644 index b81896d8894..00000000000 --- a/pkgs/development/libraries/cl-ppcre/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - simplyShare = args.simplyShare; - - version = lib.attrByPath ["version"] "2.0.0" args; - buildInputs = with args; [ ]; -in -rec { - src = fetchurl { - url = http://weitz.de/files/cl-ppcre.tar.gz; - sha256 = "1hrk051yi1qixy0vdig99cbv0v0p825acli65s08yz99b0pjz7m5"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = [(simplyShare "cl-ppcre")]; - - name = "cl-ppcre-" + version; - meta = { - description = "Common Lisp Portable Perl Compatible RegExp library"; - }; -} diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index a7b70615d93..fc2d04e649b 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation rec { name = "cppzmq"; src = fetchgit { - url = "https://github.com/zeromq/cppzmq"; - rev = "1f05e0d111197c64be32ad5aecd59f4d1b05a819"; - sha256 = "3a3507fd5646f191088e7a0a7a09846da54b0cac0fcb08f7c4c8d510b484e6da"; + url = "git://github.com/zeromq/cppzmq"; + rev = "ac705f604701e2ca1643fa31bae240f9da8b9b9a"; + sha256 = "1bcd5553601a6cdc926aa7a7c89fe54d3b14693cfce85dea97af25cf5a144398"; }; installPhase = '' diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 8fc75721c23..ad836ac732d 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, libtool , expat, systemd, glib, dbus_glib, python -, libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: +, libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }: + +assert x11Support -> libX11 != null + && libICE != null + && libSM != null; let version = "1.8.16"; @@ -8,7 +12,7 @@ let inherit (stdenv) lib; - buildInputsX = lib.optionals useX11 [ libX11 libICE libSM ]; + buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ]; # also other parts than "libs" need this statically linked lib makeInternalLib = "(cd dbus && make libdbus-internal.la)"; @@ -57,7 +61,7 @@ let "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ] ++ lib.optional (!useX11) "--without-x"; + ] ++ lib.optional (!x11Support) "--without-x"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 1a46a0e5386..9cb8f86d01d 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -64,17 +64,17 @@ , freetype ? null # Needed for drawtext filter , frei0r ? null # frei0r video filtering , fribidi ? null # Needed for drawtext filter -, game-music-emu ? null # Game Music Emulator +#, game-music-emu ? null # Game Music Emulator , gnutls ? null -, gsm ? null # GSM de/encoder +#, gsm ? null # GSM de/encoder #, ilbc ? null # iLBC de/encoder -, jack2 ? null # Jack audio (only version 2 is supported in this build) +#, jack2 ? null # Jack audio (only version 2 is supported in this build) , ladspaH ? null # LADSPA audio filtering , lame ? null # LAME MP3 encoder , libass ? null # (Advanced) SubStation Alpha subtitle rendering , libbluray ? null # BluRay reading , libbs2b ? null # bs2b DSP library -, libcaca ? null # Textual display (ASCII art) +#, libcaca ? null # Textual display (ASCII art) #, libcdio-paranoia ? null # Audio CD grabbing , libdc1394 ? null, libraw1394 ? null # IIDC-1394 grabbing (ieee 1394) , libiconv ? null @@ -100,10 +100,10 @@ , libXv ? null # Xlib support , lzma ? null # xz-utils #, nvenc ? null # NVIDIA NVENC support -, openal ? null # OpenAL 1.1 capture support +#, openal ? null # OpenAL 1.1 capture support #, opencl ? null # OpenCL code #, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder -, opencv ? null # Video filtering +#, opencv ? null # Video filtering , openglExtlib ? false, mesa ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder @@ -127,9 +127,9 @@ , x11grabExtlib ? false, libXext ? null, libXfixes ? null # X11 grabbing (legacy) , x264 ? null # H.264/AVC encoder , x265 ? null # H.265/HEVC encoder -, xavs ? null # AVS encoder +#, xavs ? null # AVS encoder , xvidcore ? null # Xvid encoder, native encoder exists -, zeromq4 ? null # Message passing +#, zeromq4 ? null # Message passing , zlib ? null #, zvbi ? null # Teletext support /* @@ -156,14 +156,19 @@ * * Packages with errors: * flite ilbc schroedinger + * opencv - circular dependency issue * * Not packaged: * aacplus avisynth cdio-paranoia crystalhd libavc1394 libiec61883 * libmxf libnut libquvi nvenc opencl opencore-amr openh264 oss shine twolame * utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video * + * Need fixes to support Darwin: + * frei0r, game-music-emu, gsm, jack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1, + * pulseaudio, rtmpdump, samba, vit-stab, wavpack, x265. xavs + * * Not supported: - * stagehright-h264(android only) + * stagefright-h264(android only) * * Known issues: * 0.5 - libgsm: configure fails to find library (fix: disable for 0.5) @@ -203,7 +208,12 @@ let # Flag change between versions (e.g. "--enable-armvfp" -> "--enable-vfp" changed in v1.1) chgFlg = chgVer: oldFlag: newFlag: if reqMin chgVer then newFlag else oldFlag; + # Disable dependency that needs fixes before it will work on Darwin + disDarwinFix = origArg: if stdenv.isDarwin then false else origArg; + isCygwin = stdenv.isCygwin; + isDarwin = stdenv.isDarwin; + isLinux = stdenv.isLinux; in /* @@ -239,38 +249,26 @@ assert avdeviceLibrary && reqMin "0.6" -> avformatLibrary && avutilLibrary; # configure flag since 0.6 assert avformatLibrary && reqMin "0.6" -> avcodecLibrary && avutilLibrary; # configure flag since 0.6 assert avresampleLibrary && reqMin "0.11" -> avutilLibrary; -assert postprocLibrary && reqMin "0.5" -> gplLicensing && avutilLibrary; +assert postprocLibrary && reqMin "0.5" -> avutilLibrary; assert swresampleLibrary && reqMin "0.9" -> soxr != null; assert swscaleLibrary && reqMin "0.5" -> avutilLibrary; /* * External libraries */ #assert aacplusExtlib && reqMin "0.7" -> nonfreeLicensing; -#assert cdio-paranoia != null && reqMin "0.9" -> gplLicensing; #assert decklinkExtlib && reqMin "2.2" -> blackmagic-design-desktop-video != null # && !isCygwin && multithreadBuild # POSIX threads required # && nonfreeLicensing; assert faacExtlib && reqMin "0.5" -> faac != null && nonfreeLicensing; -assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && gplLicensing && nonfreeLicensing; -assert frei0r != null && reqMin "0.7" -> gplLicensing; +assert fdk-aacExtlib && reqMin "1.0" -> fdk_aac != null && nonfreeLicensing; assert gnutls != null && reqMin "0.9" -> !opensslExtlib; assert libxcb-shmExtlib && reqMin "2.5" -> libxcb != null; assert libxcb-xfixesExtlib && reqMin "2.5" -> libxcb != null; assert libxcb-shapeExtlib && reqMin "2.5" -> libxcb != null; -#assert opencore-amr != null && reqMin "0.5" -> version3Licensing; assert openglExtlib && reqMin "2.2" -> mesa != null; -assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && gplLicensing && nonfreeLicensing; -assert sambaExtlib && reqMin "2.3" -> samba != null && gplLicensing && version3Licensing; -#assert utvideo != null && reqMin "0.9" -> gplLicensing; -assert vid-stab != null && reqMin "2.0" -> gplLicensing; -#assert vo-aacenc != null && reqMin "0.6" -> version3Licensing; -#assert vo-amrwbenc != null && reqMin "0.7" -> version3Licensing; -assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null && gplLicensing; -assert x264 != null && reqMin "0.5" -> gplLicensing; -assert x265 != null && reqMin "2.2" -> gplLicensing; -assert xavs != null && reqMin "0.7" -> gplLicensing; -assert xvidcore != null && reqMin "0.5" -> gplLicensing; -#assert zvbi != null && reqMin "2.1" -> gplLicensing; +assert opensslExtlib && reqMin "0.9" -> gnutls == null && openssl != null && nonfreeLicensing; +assert sambaExtlib && reqMin "2.3" -> samba != null && !isDarwin; +assert x11grabExtlib && reqMin "0.5" -> libX11 != null && libXv != null; with stdenv.lib; stdenv.mkDerivation rec { @@ -295,9 +293,10 @@ stdenv.mkDerivation rec { /* * Build flags */ - # One some ARM platforms --enable-thumb + # On some ARM platforms --enable-thumb "--enable-shared --disable-static" (mkFlag true "0.6" "pic") + (if (stdenv.cc.cc.isClang or false) then "--cc=clang" else null) (mkFlag smallBuild "0.5" "small") (mkFlag runtime-cpudetectBuild "0.5" "runtime-cpudetect") (mkFlag grayBuild "0.5" "gray") @@ -334,7 +333,7 @@ stdenv.mkDerivation rec { (mkFlag avformatLibrary "0.6" "avformat") (mkFlag avresampleLibrary "1.0" "avresample") (mkFlag avutilLibrary "1.1" "avutil") - (mkFlag postprocLibrary "0.5" "postproc") + (mkFlag (postprocLibrary && gplLicensing) "0.5" "postproc") (mkFlag swresampleLibrary "0.9" "swresample") (mkFlag swscaleLibrary "0.5" "swscale") /* @@ -359,18 +358,18 @@ stdenv.mkDerivation rec { #(mkFlag decklinkExtlib "2.2" "decklink") (mkFlag faacExtlib "0.5" "libfaac") (depFlag faad2Extlib "0.5" "0.6" "libfaad") - (mkFlag fdk-aacExtlib "1.0" "libfdk-aac") + (mkFlag (fdk-aacExtlib && gplLicensing) "1.0" "libfdk-aac") #(mkFlag (flite != null) "1.0" "libflite") (if reqMin "1.0" then # Force disable until a solution is found "--disable-libflite" else null) (mkFlag (fontconfig != null) "1.0" "fontconfig") (mkFlag (freetype != null) "0.7" "libfreetype") - (mkFlag (frei0r != null) "0.7" "frei0r") + (mkFlag (disDarwinFix (frei0r != null && gplLicensing)) "0.7" "frei0r") (mkFlag (fribidi != null) "2.3" "libfribidi") - (mkFlag (game-music-emu != null) "2.2" "libgme") + #(mkFlag (disDarwinFix (game-music-emu != null)) "2.2" "libgme") (mkFlag (gnutls != null) "0.9" "gnutls") - (verFix (mkFlag (gsm != null) "0.5" "libgsm") "0.5" "--disable-libgsm") + #(verFix (mkFlag (disDarwinFix (gsm != null)) "0.5" "libgsm") "0.5" "--disable-libgsm") #(mkFlag (ilbc != null) "1.0" "libilbc") (mkFlag (ladspaH !=null) "2.1" "ladspa") (mkFlag (lame != null) "0.5" "libmp3lame") @@ -378,21 +377,21 @@ stdenv.mkDerivation rec { #(mkFlag (libavc1394 != null) null null) (mkFlag (libbluray != null) "1.0" "libbluray") (mkFlag (libbs2b != null) "2.3" "libbs2b") - (mkFlag (libcaca != null) "1.0" "libcaca") - #(mkFlag (cdio-paranoia != null) "0.9" "libcdio") - (mkFlag (libdc1394 != null && libraw1394 != null) "0.5" "libdc1394") + #(mkFlag (libcaca != null) "1.0" "libcaca") + #(mkFlag (cdio-paranoia != null && gplLicensing) "0.9" "libcdio") + (mkFlag (if !isLinux then false else libdc1394 != null && libraw1394 != null && isLinux) "0.5" "libdc1394") (mkFlag (libiconv != null) "1.2" "iconv") - #(mkFlag (libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") + #(mkFlag (if !isLinux then false else libiec61883 != null && libavc1394 != null && libraw1394 != null) "1.0" "libiec61883") #(mkFlag (libmfx != null) "2.6" "libmfx") - (mkFlag (libmodplug != null) "0.9" "libmodplug") + (mkFlag (disDarwinFix (libmodplug != null)) "0.9" "libmodplug") #(mkFlag (libnut != null) "0.5" "libnut") (mkFlag (libopus != null) "1.0" "libopus") - (mkFlag (libssh != null) "2.1" "libssh") + (mkFlag (disDarwinFix (libssh != null)) "2.1" "libssh") (mkFlag (libtheora != null) "0.5" "libtheora") - (mkFlag (libva != null) "0.6" "vaapi") + (mkFlag (if isDarwin then false else libva != null) "0.6" "vaapi") (mkFlag (libvdpau != null) "0.5" "vdpau") (mkFlag (libvorbis != null) "0.5" "libvorbis") - (mkFlag (libvpx != null) "0.6" "libvpx") + (mkFlag (disDarwinFix (libvpx != null)) "0.6" "libvpx") (mkFlag (libwebp != null) "2.2" "libwebp") (mkFlag (libX11 != null && libXv != null) "2.3" "xlib") (mkFlag (libxcb != null) "2.5" "libxcb") @@ -401,39 +400,38 @@ stdenv.mkDerivation rec { (mkFlag libxcb-shapeExtlib "2.5" "libxcb-shape") (mkFlag (lzma != null) "2.4" "lzma") #(mkFlag nvenc "2.6" "nvenc") - (mkFlag (openal != null) "0.9" "openal") + #(mkFlag (disDarwinFix (openal != null)) "0.9" "openal") #(mkFlag opencl "2.2" "opencl") - #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrnb") - #(mkFlag (opencore-amr != null) "0.5" "libopencore-amrwb") - (mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 + #(mkFlag (opencore-amr != null && version3Licensing) "0.5" "libopencore-amrnb") + #(mkFlag (opencv != null) "1.1" "libopencv") # Actual min. version 0.7 (mkFlag openglExtlib "2.2" "opengl") #(mkFlag (openh264 != null) "2.6" "openh264") - (mkFlag (openjpeg_1 != null) "0.5" "libopenjpeg") - (mkFlag opensslExtlib "0.9" "openssl") - (mkFlag (pulseaudio != null) "0.9" "libpulse") + (mkFlag (disDarwinFix (openjpeg_1 != null)) "0.5" "libopenjpeg") + (mkFlag (opensslExtlib && gplLicensing) "0.9" "openssl") + (mkFlag (disDarwinFix (pulseaudio != null)) "0.9" "libpulse") #(mkFlag quvi "2.0" "libquvi") - (mkFlag (rtmpdump != null) "0.6" "librtmp") + (mkFlag (disDarwinFix (rtmpdump != null)) "0.6" "librtmp") #(mkFlag (schroedinger != null) "0.5" "libschroedinger") #(mkFlag (shine != null) "2.0" "libshine") - (mkFlag sambaExtlib "2.3" "libsmbclient") + (mkFlag (disDarwinFix (sambaExtlib && gplLicensing && version3Licensing)) "2.3" "libsmbclient") (mkFlag (SDL != null) "2.5" "sdl") # Only configurable since 2.5, auto detected before then (mkFlag (soxr != null) "1.2" "libsoxr") (mkFlag (speex != null) "0.5" "libspeex") #(mkFlag (twolame != null) "1.0" "libtwolame") - #(mkFlag (utvideo != null) "0.9" "libutvideo") - (mkFlag (v4l_utils != null) "0.9" "libv4l2") - (mkFlag (vid-stab != null) "2.2" "libvidstab") # Actual min. version 2.0 - #(mkFlag (vo-aacenc != null) "0.6" "libvo-aacenc") - #(mkFlag (vo-amrwbenc) "0.7" "libvo-amrwbenc") - (mkFlag (wavpack != null) "2.0" "libwavpack") - (mkFlag (x11grabExtlib) "0.5" "x11grab") - (mkFlag (x264 != null) "0.5" "libx264") - (mkFlag (x265 != null) "2.2" "libx265") - (mkFlag (xavs != null) "0.7" "libxavs") - (mkFlag (xvidcore != null) "0.5" "libxvid") - (mkFlag (zeromq4 != null) "2.0" "libzmq") + #(mkFlag (utvideo != null && gplLicensing) "0.9" "libutvideo") + #(mkFlag (if !isLinux then false else v4l_utils != null && isLinux) "0.9" "libv4l2") + (mkFlag (disDarwinFix (vid-stab != null && gplLicensing)) "2.2" "libvidstab") # Actual min. version 2.0 + #(mkFlag (vo-aacenc != null && version3Licensing) "0.6" "libvo-aacenc") + #(mkFlag (vo-amrwbenc != null && version3Licensing) "0.7" "libvo-amrwbenc") + (mkFlag (disDarwinFix (wavpack != null)) "2.0" "libwavpack") + (mkFlag (x11grabExtlib && gplLicensing) "0.5" "x11grab") + (mkFlag (x264 != null && gplLicensing) "0.5" "libx264") + (mkFlag (disDarwinFix (x265 != null && gplLicensing)) "2.2" "libx265") + #(mkFlag (disDarwinFix (xavs != null && gplLicensing)) "0.7" "libxavs") + (mkFlag (xvidcore != null && gplLicensing) "0.5" "libxvid") + #(mkFlag (zeromq4 != null) "2.0" "libzmq") (mkFlag (zlib != null) "0.5" "zlib") - #(mkFlag (zvbi != null) "2.1" "libzvbi") + #(mkFlag (zvbi != null && gplLicensing) "2.1" "libzvbi") /* * Developer flags */ @@ -449,14 +447,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; buildInputs = [ - alsaLib bzip2 celt faad2 fdk_aac fontconfig freetype frei0r fribidi - game-music-emu gnutls gsm jack2 ladspaH lame libass libbluray libbs2b - libcaca libdc1394 libmodplug libogg libopus libraw1394 libssh libtheora - libva libvdpau libvpx libvorbis libwebp libX11 libxcb libXext libXfixes - libXv lzma mesa openal opencv openjpeg_1 openssl pulseaudio rtmpdump - samba SDL soxr speex v4l_utils vid-stab wavpack x264 x265 xavs xvidcore - zeromq4 zlib - ] ++ optional faacExtlib faac; + bzip2 celt fontconfig freetype fribidi gnutls ladspaH lame libass libbluray + libbs2b /* libcaca */ libdc1394 libogg libopus libtheora libvdpau libvorbis + libwebp libX11 libxcb libXext libXfixes libXv lzma SDL soxr speex x264 + xvidcore /* zeromq4 */ zlib + ] ++ optional (disDarwinFix sambaExtlib) samba + ++ optional openglExtlib mesa + ++ optionals x11grabExtlib [ libXext libXfixes ] + ++ optionals nonfreeLicensing [ faac faad2 fdk_aac openssl ] + ++ optionals (!isDarwin) [ + frei0r /* game-music-emu gsm jack2 */ libmodplug libssh libvpx /* openal */ + openjpeg_1 pulseaudio rtmpdump vid-stab wavpack x265 /* xavs */ + ] ++ optional (!isDarwin && !isCygwin) libva + ++ optionals isLinux [ alsaLib libraw1394 /* v4l_utils */ ]; # Build qt-faststart executable buildPhase = optional (qt-faststartProgram && (reqMin "0.9")) ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 83735376b98..104b7229bb1 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -16,16 +16,20 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--disable-static" - "--enable-threads" "--enable-openmp" # very small wrappers + "--enable-threads" ] ++ optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 - ++ optional stdenv.isx86_64 "--enable-sse2"; + ++ optional stdenv.isx86_64 "--enable-sse2" + ++ optional (stdenv.cc.cc.isGNU or false) "--enable-openmp"; enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { description = "Fastest Fourier Transform in the West library"; homepage = http://www.fftw.org/; + license = licenses.gpl2Plus; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index bffb124dc68..145d2b42a9d 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "flann-1.8.4"; - + src = fetchurl { url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip; sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz"; @@ -10,11 +10,14 @@ stdenv.mkDerivation { buildInputs = [ unzip cmake python ]; + # patch out examples in Darwin because they do not compile. + patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-examples.patch ]; + meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/flann/no-examples.patch b/pkgs/development/libraries/flann/no-examples.patch new file mode 100644 index 00000000000..95a6f0eed8e --- /dev/null +++ b/pkgs/development/libraries/flann/no-examples.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -155,7 +155,7 @@ + + add_subdirectory( cmake ) + add_subdirectory( src ) +-add_subdirectory( examples ) ++#add_subdirectory( examples ) + add_subdirectory( test ) + add_subdirectory( doc ) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index e2ac798d203..180de724d95 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -2,14 +2,14 @@ , google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { - version = "0.22.0"; + version = "0.32.0"; name = "folly-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "12p7vbx73jmhf772nbqvd8imw4ihpi16cw6cwxq459r7qds4n0ca"; + sha256 = "0yviih6b220bv6d1rg4lx1hqprqapnzfv4rv64cwjxbmz49ckmzh"; }; buildInputs = [ libiberty boost.lib libevent double_conversion glog google-gflags openssl ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "A YAML parser and emitter for C++"; - homepage = https://code.google.com/p/yaml-cpp/; + description = "An open-source C++ library developed and used at Facebook"; + homepage = https://github.com/facebook/folly; license = licenses.mit; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix new file mode 100644 index 00000000000..1f68131efd5 --- /dev/null +++ b/pkgs/development/libraries/garmintools/default.nix @@ -0,0 +1,14 @@ +{ stdenv, fetchurl, libusb }: +stdenv.mkDerivation { + name = "garmintools-0.10"; + src = fetchurl { + url = https://garmintools.googlecode.com/files/garmintools-0.10.tar.gz; + sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; + }; + buildInputs = [ libusb ]; + meta = { + homepage = https://code.google.com/p/garmintools; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.ocharles ]; + }; +} diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 579d22ad754..237b5537ba4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl }: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj, geos, openssl +, libpng }: composableDerivation.composableDerivation {} (fixed: rec { version = "1.11.2"; @@ -10,7 +11,7 @@ composableDerivation.composableDerivation {} (fixed: rec { sha256 = "66bc8192d24e314a66ed69285186d46e6999beb44fc97eeb9c76d82a117c0845"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj openssl ]; + buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ]; # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults. # Unset CC and CXX as they confuse libtool. @@ -19,10 +20,11 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg}" "--with-libtiff=${libtiff}" # optional (without largetiff support) + "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" - "--with-mysql=${mysql}/bin/mysql_config" + "--with-mysql=${mysql.lib}/bin/mysql_config" "--with-geotiff=${libgeotiff}" "--with-python" # optional "--with-static-proj4=${proj}" # optional diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 27e2cad062b..da6a3ad1dff 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -2,15 +2,15 @@ , jasper, libintlOrEmpty, gobjectIntrospection }: let - ver_maj = "2.30"; - ver_min = "8"; + ver_maj = "2.31"; + ver_min = "3"; in stdenv.mkDerivation rec { name = "gdk-pixbuf-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "1gpqpskp4zzf7h35bp247jcvnk6rxc52r69pb11v8g8i2q386ls8"; + sha256 = "ddd861747bb7c580acce7cfa3ce38c3f52a9516e66a6477988fd100c8fb9eabc"; }; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index a589d625273..38432f68273 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { # needs fonts otherwise don't know how to pass them configureFlags = "--disable-docs"; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index c688e42edea..0841990fa95 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "glm-0.9.6.0"; + name = "glm-0.9.6.1"; src = fetchurl { url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; - sha256 = "0gq79gxjm449ryi8l94rahrqy2cjccnrvivxgbwp10xdlfdyc4ha"; + sha256 = "1s1kpf9hpyq6bdf87nhlkxyr2ay0ip9wqicdma9h8yz4vs20r2hs"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 9d06f4b1c5d..9723bf90eb0 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -9,14 +9,14 @@ assert sslSupport -> openssl != null; assert idnSupport -> libidn != null; let - version = "1.0.12"; + version = "1.0.13"; in stdenv.mkDerivation rec { name = "gloox-${version}"; src = fetchurl { url = "http://camaya.net/download/gloox-${version}.tar.bz2"; - sha256 = "1aa3pkg8yz6glg2273yl7310nkx1q31wkwbmmxwk3059k0p5l4k7"; + sha256 = "12payqyx1ly8nm3qn24bj0kyy9d08sixnjqxw7fn6rbwr7m1x7sd"; }; buildInputs = [ ] diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 5818726e345..59f97e46bef 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { patches = [ ./Makefile.in.patch ]; + dontStrip = true; + meta = with stdenv.lib; { homepage = http://www.mono-project.com/docs/gui/gtksharp/; description = "A .NET language binding for assorted GNOME libraries"; diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index e9254a445de..e46b1dfd8e6 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -1,70 +1,10 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp }: +{ callPackage, fetchurl, ... } @ args: -assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { - name = "gnutls-3.2.20"; +callPackage ./generic.nix (args // rec { + version = "3.2.21"; src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "0mjwzj486g0aj5i3zr70mixmbd4ldrj1ckrwmcr90si6bqa0sc6q"; - }; - - patches = - # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. - stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch - ; - - # Note: GMP is a dependency of Nettle, whose public headers include - # GMP headers, hence the hack. - configurePhase = '' - ./configure --prefix="$out" \ - --disable-dependency-tracking --enable-fast-install \ - --without-p11-kit \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ - --with-libnettle-prefix="${nettle}" \ - CPPFLAGS="-I${gmp}/include" \ - ${stdenv.lib.optionalString guileBindings - "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} - ''; - - # Build of the Guile bindings is not parallel-safe. See - # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad> - # for the actual fix. - enableParallelBuilding = !guileBindings; - - buildInputs = [ zlib lzo lzip ] - ++ stdenv.lib.optional guileBindings guile; - - nativeBuildInputs = [ perl pkgconfig ]; - - propagatedBuildInputs = [ nettle libtasn1 ]; - - # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); - - meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; - - homepage = http://www.gnu.org/software/gnutls/; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.all; + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-${version}.tar.lz"; + sha256 = "1xydzlwmf0frxvr26yw0ily5vwkdvf90m53fix61bi5gx4xd2m7m"; }; -} +}) diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix new file mode 100644 index 00000000000..fbf51f34ff8 --- /dev/null +++ b/pkgs/development/libraries/gnutls/3.3.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "3.3.14"; + + src = fetchurl { + url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.lz"; + sha256 = "1117j71ng66syddw10yazrniqkd326hcigx2hfcw4s86rk0kqanv"; + }; +}) diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix new file mode 100644 index 00000000000..9c1c2e1b7d8 --- /dev/null +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -0,0 +1,71 @@ +{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip +, guileBindings, guile, perl, gmp + +# Version dependent args +, version, src +, ...}: + +assert guileBindings -> guile != null; + +stdenv.mkDerivation rec { + name = "gnutls-${version}"; + + inherit src; + + patches = + # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used. + stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch + ; + + # Note: GMP is a dependency of Nettle, whose public headers include + # GMP headers, hence the hack. + configurePhase = '' + ./configure --prefix="$out" \ + --disable-dependency-tracking --enable-fast-install \ + --without-p11-kit \ + --with-lzo --with-libtasn1-prefix="${libtasn1}" \ + --with-libnettle-prefix="${nettle}" \ + CPPFLAGS="-I${gmp}/include" \ + ${stdenv.lib.optionalString guileBindings + "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} + ''; + + # Build of the Guile bindings is not parallel-safe. See + # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad> + # for the actual fix. + enableParallelBuilding = !guileBindings; + + buildInputs = [ zlib lzo lzip ] + ++ stdenv.lib.optional guileBindings guile; + + nativeBuildInputs = [ perl pkgconfig ]; + + propagatedBuildInputs = [ nettle libtasn1 ]; + + # XXX: Gnulib's `test-select' fails on FreeBSD: + # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + + meta = with stdenv.lib; { + description = "The GNU Transport Layer Security Library"; + + longDescription = '' + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed standards by + the IETF's TLS working group. + + Quoting from the TLS protocol specification: + + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." + ''; + + homepage = http://www.gnu.org/software/gnutls/; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ eelco wkennington ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index fa350110476..35b40a507a8 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -21,12 +21,14 @@ stdenv.mkDerivation rec { sha256 = "1l45nd7ln2pnrf99vdki3l7an5wrzkbak11hnnj1w6r3fkm4xmv1"; }; + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ]; buildInputs = [ libxkbcommon ]; propagatedBuildInputs = with xlibs; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ] - ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ] + [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ] + ++ optionals stdenv.isLinux [ wayland ] ++ optional stdenv.isDarwin x11 ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index c9098fc0850..b9f2f3c77e5 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkspell-${version}"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz"; - sha256 = "1hqaddgzxjw9lpsphankld6a8bpm92hfv46kp99cgmj82rdjwdq1"; + sha256 = "1hiwzajf18v9ik4nai3s7frps4ccn9s20nggad1c4k2mwb9ydwhk"; }; buildInputs = [ aspell pkgconfig gtk3 enchant intltool ]; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index a7ec3a75878..311bfe2c209 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.38"; + name = "harfbuzz-0.9.40"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "056mrzf6ry78s8nvnj4rqzc1gml2lcn314ijdzmsmz7dnj1z6dk7"; + sha256 = "07rjp05axas96fp23lpf8l2yyfdj9yib4m0qjv592vdyhcsxaw8p"; }; configureFlags = [ diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix deleted file mode 100644 index b5e0a258fde..00000000000 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, ghcjsBase, mtl, text }: - -cabal.mkDerivation (self: { - pname = "ghcjs-dom"; - version = "0.1.1.3"; - sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly"; - buildDepends = [ ghcjsBase mtl text ]; - meta = { - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index 28e7e515c2b..0eb3c13f9bd 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -12,6 +12,10 @@ cabal.mkDerivation (self: { buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; pkgconfigDepends = [ cairo gdk_pixbuf glib gtk pango popplerGlib ]; + patchPhase = '' + sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal + sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc + ''; meta = { homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the Poppler"; diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index bfa7675034a..0189ecda77f 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -60,17 +60,17 @@ let { shortName, shortDescription, longDescription, dictFileName }: mkDict rec { inherit dictFileName; - version = "5.2"; + version = "5.3"; name = "hunspell-dict-${shortName}-dicollecte-${version}"; readmeFile = "README_dict_fr.txt"; src = fetchurl { url = "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v${version}.zip"; - sha256 = "c5863f7592a8c4defe8b4ed2b3b45f6f10ef265d34ae9881c1f3bbb3b80bdd02"; + sha256 = "0ca7084jm7zb1ikwzh1frvpb97jn27i7a5d48288h2qlfp068ik0"; }; meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = http://www.dicollecte.org/home.php?prj=fr; + homepage = "http://www.dicollecte.org/home.php?prj=fr"; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -86,7 +86,7 @@ let readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; - homepage =http://wordlist.aspell.net/; + homepage = http://wordlist.aspell.net/; license = licenses.bsd3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch new file mode 100644 index 00000000000..db6af6daebd --- /dev/null +++ b/pkgs/development/libraries/ilmbase/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap +--- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 7f8147261ce..816a9c023e1 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, openexr, automake, autoconf, libtool }: +{ stdenv, openexr, automake, autoconf, libtool, which }: stdenv.mkDerivation { name = "ilmbase-${openexr.source.version}"; @@ -13,7 +13,9 @@ stdenv.mkDerivation { ./bootstrap ''; - buildInputs = [ automake autoconf libtool ]; + buildInputs = [ automake autoconf libtool which ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/indilib/0_9_9.nix b/pkgs/development/libraries/indilib/0_9_9.nix deleted file mode 100644 index f9447b14364..00000000000 --- a/pkgs/development/libraries/indilib/0_9_9.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb1, zlib, boost, libnova, libjpeg, gsl, pkgconfig }: - -stdenv.mkDerivation { - name = "indilib-0.9.9"; - - src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.9.9.tar.gz; - sha256 = "720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039"; - }; - - propagatedBuildInputs = [ cfitsio libusb1 zlib boost libnova libjpeg gsl ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - preConfigure = '' - cmakeFlags+=" -DUDEVRULES_INSTALL_DIR=$out/etc/udev/rules.d" - ''; - - meta = { - homepage = http://indi.sf.net; - }; -} diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index dd8207ffa2b..b060498d40a 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }: +{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova +, libjpeg, gsl }: stdenv.mkDerivation { - name = "indilib-0.9.6"; + name = "indilib-1.0.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.9.6.tar.gz; - sha256 = "1cyhsrsl68iczc4gcdnrrdh0r1dxjac6prxjfkw15wz97ya0mvs4"; + url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz; + sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm"; }; - patches = [ ./link-zlib.patch ./udev-dir.patch ]; + patches = [ ./udev-dir.patch ] ; - propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ]; + propagatedBuildInputs = [ cmake cfitsio libusb zlib boost + libnova libjpeg gsl ]; meta = { homepage = http://indi.sf.net; diff --git a/pkgs/development/libraries/indilib/link-zlib.patch b/pkgs/development/libraries/indilib/link-zlib.patch deleted file mode 100644 index c051194a1b8..00000000000 --- a/pkgs/development/libraries/indilib/link-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt ---- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 -+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 16:50:25.666624174 -0430 -@@ -169,7 +169,7 @@ - # To link with main() and indibase classes ###### - ################################################## - add_library(indidriver SHARED ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS}) --target_link_libraries(indidriver ${LIBUSB_LIBRARIES}) -+target_link_libraries(indidriver z ${LIBUSB_LIBRARIES}) - if (NOVA_FOUND) - target_link_libraries(indidriver ${NOVA_LIBRARIES}) - endif(NOVA_FOUND) diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch index 2f6d03d6070..0f497419e70 100644 --- a/pkgs/development/libraries/indilib/udev-dir.patch +++ b/pkgs/development/libraries/indilib/udev-dir.patch @@ -1,12 +1,12 @@ -diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt ---- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 -+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 17:02:55.455944987 -0430 -@@ -13,7 +13,7 @@ - set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/") - set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") --set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d") -+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d") +diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt +--- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430 ++++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430 +@@ -28,7 +28,7 @@ + ## the following are directories where stuff will be installed to + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") + set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/") +-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") - IF(APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup") + ################## Includes ################################ + Include (CheckCXXSourceCompiles) diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 795062f12d5..d942dd7b692 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -6,11 +6,21 @@ , libsoup }: -let metadata = if stdenv.system == "i686-linux" - then { arch = "x86"; sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; } - else if stdenv.system == "x86_64-linux" - then { arch = "x86_64"; sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; } - else { }; +let + platformMap = { + "x86_64-linux" = + { platform = "gtk-linux-x86_64"; + sha256 = "0hq48zfqx2p0fqr0rlabnz2pdj0874k19918a4dbj0fhzkhrh959"; }; + "i686-linux" = + { platform = "gtk-linux-x86"; + sha256 = "10si8kmc7c9qmbpzs76609wkfb784pln3qpmra73gb3fbk7z8caf"; }; + "x86_64-darwin" = + { platform = "cocoa-macosx-x86_64"; + sha256 = "1565gg63ssrl04fh355vf9mnmq8qwwki3zpc3ybm7bylgkfwc9h4"; }; + }; + + metadata = assert platformMap ? ${stdenv.system}; platformMap.${stdenv.system}; + in stdenv.mkDerivation rec { version = "3.7.2"; fullVersion = "${version}-201202080800"; @@ -22,7 +32,7 @@ in stdenv.mkDerivation rec { # releases of SWT. So we just grab a binary release and extract # "src.zip" from that. src = fetchurl { - url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-gtk-linux-${metadata.arch}.zip"; + url = "http://archive.eclipse.org/eclipse/downloads/drops/R-${fullVersion}/${name}-${metadata.platform}.zip"; sha256 = metadata.sha256; }; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix new file mode 100644 index 00000000000..2e0c75c1452 --- /dev/null +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jbigkit-2.1"; + + src = fetchurl { + url = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/download/${name}.tar.gz"; + sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; + }; + + postPatch = '' + sed -i 's/^\(CFLAGS.*\)$/\1 -fPIC/' Makefile + '' + stdenv.lib.optionalString (stdenv.cc.cc.isClang or false) '' + substituteInPlace Makefile libjbig/Makefile pbmtools/Makefile \ + --replace "CC = gcc" "CC = clang" + ''; + + installPhase = '' + install -D -m644 libjbig/libjbig.a $out/lib/libjbig.a + install -D -m644 libjbig/libjbig85.a $out/lib/libjbig85.a + install -D -m644 libjbig/jbig.h $out/include/jbig.h + install -D -m644 libjbig/jbig_ar.h $out/include/jbig_ar.h + install -D -m644 libjbig/jbig85.h $out/include/jbig85.h + + install -d -m755 $out/share/man/man1 + install -m644 pbmtools/*.1* $out/share/man/man1 + + install -D -m755 pbmtools/jbgtopbm $out/bin/jbgtopbm + install -D -m755 pbmtools/pbmtojbg $out/bin/pbmtojbg + install -D -m755 pbmtools/jbgtopbm85 $out/bin/jbgtopbm85 + install -D -m755 pbmtools/pbmtojbg85 $out/bin/pbmtojbg85 + ''; + + meta = with stdenv.lib; { + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; + description = "a software implementation of the JBIG1 data compression standard"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 8bb015a6c5f..db82c943d7c 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libtiff, libjpeg, zlib}: stdenv.mkDerivation rec { - name = "lcms2-2.6"; + name = "lcms2-2.7"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "1c8lgq8gfs3nyplvbx9k8wzfj6r2bqi3f611vb1m8z3476454wji"; + sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; }; propagatedBuildInputs = [ libtiff libjpeg zlib ]; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 94dfe871240..ebb90f79663 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: +{ stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3 }: stdenv.mkDerivation rec { name = "lensfun-0.2.8"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; - buildInputs = [ pkgconfig glib zlib libpng ]; + buildInputs = [ pkgconfig glib zlib libpng gnumake3 ]; configureFlags = "-v"; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 7dda6912a98..2a9af50fcde 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Portable ASS/SSA subtitle renderer"; homepage = https://github.com/libass/libass; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel urkud ]; repositories.git = git://github.com/libass/libass.git; }; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 542aa3cb340..8836b0bffa2 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3"; }; - buildInputs = [ libdbi mysql sqlite postgresql ]; + buildInputs = [ libdbi sqlite postgresql ] + ++ optional (mysql != null) mysql.lib; postPatch = '' sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure; @@ -26,8 +27,8 @@ stdenv.mkDerivation rec { "--with-dbi-libdir=${libdbi}/lib" ] ++ optionals (mysql != null) [ "--with-mysql" - "--with-mysql-incdir=${mysql}/include/mysql" - "--with-mysql-libdir=${mysql}/lib/mysql" + "--with-mysql-incdir=${mysql.lib}/include/mysql" + "--with-mysql-libdir=${mysql.lib}/lib/mysql" ] ++ optionals (postgresql != null) [ "--with-pgsql" "--with-pgsql_incdir=${postgresql}/include" diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index afde4e260e8..1d6b00abe53 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa"; }; - buildInputs = [ libraw1394 libusb1 ]; + buildInputs = [ libusb1 ] + ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ]; meta = { homepage = http://sourceforge.net/projects/libdc1394/; description = "Capture and control API for IIDC compliant cameras"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 6cbbddfdba8..abc7dd3af40 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; } ) ./ftbfs-libpng15.patch + ./il_endian.h.patch ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libdevil/il_endian.h.patch b/pkgs/development/libraries/libdevil/il_endian.h.patch new file mode 100644 index 00000000000..c220e6802fd --- /dev/null +++ b/pkgs/development/libraries/libdevil/il_endian.h.patch @@ -0,0 +1,27 @@ +Source: http://sourceforge.net/p/resil/tickets/8/ +--- devil-1.7.8.orig/src-IL/include/il_endian.h.orig 2009-03-08 01:10:08.000000000 -0600 ++++ devil-1.7.8/src-IL/include/il_endian.h 2013-11-03 01:52:37.000000000 -0600 +@@ -19,9 +19,13 @@ + #ifndef __BIG_ENDIAN__ + #define __BIG_ENDIAN__ 1 + #endif ++#else ++ #ifndef __LITTLE_ENDIAN__ ++ #define __LITTLE_ENDIAN__ 1 ++ #endif + #endif + +-#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __BIG_ENDIAN__) \ ++#if (defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) \ + || (defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)) + #undef __LITTLE_ENDIAN__ + #define Short(s) iSwapShort(s) +@@ -39,8 +43,6 @@ + #define BigDouble(d) + #else + #undef __BIG_ENDIAN__ +- #undef __LITTLE_ENDIAN__ // Not sure if it's defined by any compiler... +- #define __LITTLE_ENDIAN__ + #define Short(s) + #define UShort(s) + #define Int(i) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index ecc92fce40c..5323cc693fc 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }: stdenv.mkDerivation rec { - name = "libdrm-2.4.59"; + name = "libdrm-2.4.60"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b"; + sha256 = "12cqnmssi6mbr93n29mm84k8wix5nx6zs82k7wcmj7z3r335ymwr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index a2065111190..818177ff49d 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.3.0"; + name = "libebml-1.3.1"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "1plnh2dv8k9s4d06c2blv2sl8bnz6d6shvj0h00al597nvb79c43"; + sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r"; }; - configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out)"; - - meta = { + meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; + license = licenses.lgpl21; homepage = http://dl.matroska.org/downloads/libebml/; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 6b070c170c7..90cab2cc687 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -1,25 +1,16 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl }: - inherit (s) name; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - +stdenv.mkDerivation rec { + name = "libev-${version}"; + version="4.19"; + src = fetchurl { + url = "http://dist.schmorp.de/libev/${name}.tar.gz"; + sha256 = "1jyw7qbl0spxqa0dccj9x1jsw7cj7szff43cq4acmklnra4mzz48"; + }; meta = { - description = "An event loop library remotely similar to libevent"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = a.lib.platforms.all; + description = "A high-performance event loop/event model with lots of features"; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.bsd2; # or GPL2+ }; } diff --git a/pkgs/development/libraries/libev/src-for-default.nix b/pkgs/development/libraries/libev/src-for-default.nix deleted file mode 100644 index 3e4f58a5ce0..00000000000 --- a/pkgs/development/libraries/libev/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="4.15"; - name="libev-4.15"; - hash="1svgc1hq4i5zsw4i02sf7xb4pk2d8kpvc1gdrd856vsmffh47pdj"; - url="http://dist.schmorp.de/libev/Attic/libev-${version}.tar.gz"; - advertisedUrl="http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz"; - - -} diff --git a/pkgs/development/libraries/libev/src-info-for-default.nix b/pkgs/development/libraries/libev/src-info-for-default.nix deleted file mode 100644 index e14ca419550..00000000000 --- a/pkgs/development/libraries/libev/src-info-for-default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - downloadPage = "http://dist.schmorp.de/libev/Attic/?M=D"; - sourceRegexp = "(^|/)libev-.*[.]tar[.]gz"; - baseName = "libev"; -} diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 19c2d2a6b80..078a2ab0733 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -13,7 +13,7 @@ let sourceInfo = rec { method="fetchgit"; baseName="libfixposix"; - url="git://gitorious.org/${baseName}/${baseName}"; + url="https://github.com/sionescu/libfixposix"; rev="30b75609d858588ea00b427015940351896867e9"; version="git-${rev}"; name="${baseName}-${version}"; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index ffbed794599..aad6214f2d4 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, nss, nspr, gdk_pixbuf }: +{ stdenv, fetchurl, pkgconfig, libusb, pixman, glib, nss, nspr, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "libfprint-0.5.1"; + name = "libfprint-0.6.0"; src = fetchurl { url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "1cwgaswqcvvbclahk2m2qr09k7lf7l8jwvgf3svq92w8j4xmc4kd"; + sha256 = "1giwh2z63mn45galsjb59rhyrvgwcy01hvvp4g01iaa2snvzr0r5"; }; - buildInputs = [ libusb glib nss nspr gdk_pixbuf ]; + buildInputs = [ libusb pixman glib nss nspr gdk_pixbuf ]; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/development/libraries/libfprint/master.nix b/pkgs/development/libraries/libfprint/master.nix deleted file mode 100644 index 06d033d0c02..00000000000 --- a/pkgs/development/libraries/libfprint/master.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchgit, libtool, autoconf, automake113x, pkgconfig, libusb, glib, nss, nspr, pixman }: - -stdenv.mkDerivation rec { - name = "libfprint"; - - src = fetchgit { - url = "git://anongit.freedesktop.org/libfprint/libfprint"; - rev = "a3c90f2b24434aa36f782aca3950fd89af01fce0"; - sha256 = "01qa58vq299xzxzxrcqkl51k8396wh56674d9wjmkv2msxx877hi"; - }; - - buildInputs = [ libusb glib nss nspr pixman ]; - nativeBuildInputs = [ libtool autoconf automake113x pkgconfig ]; - - configureScript = "./autogen.sh"; - - configureFlags = [ "--prefix=$(out)" "--disable-examples-build" "--disable-x11-examples-build" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; - - meta = with stdenv.lib; { - homepage = "http://www.freedesktop.org/wiki/Software/fprint/libfprint/"; - description = "A library designed to make it easy to add support for consumer fingerprint readers"; - license = licenses.lgpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; - }; -} diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix new file mode 100644 index 00000000000..2540d22b8d4 --- /dev/null +++ b/pkgs/development/libraries/libfpx/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libfpx-1.3.1-4"; + + src = fetchurl { + url = "mirror://imagemagick/delegates/${name}.tar.xz"; + sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; + }; + + # Darwin gets misdetected as Windows without this + NIX_CFLAGS_COMPILE = if stdenv.isDarwin then "-D__unix" else null; + + # This dead code causes a duplicate symbol error in Clang so just remove it + postPatch = if (stdenv.cc.cc.isClang or false) then '' + substituteInPlace jpeg/ejpeg.h --replace "int No_JPEG_Header_Flag" "" + '' else null; + + meta = with stdenv.lib; { + homepage = http://www.imagemagick.org; + description = "A library for manipulating FlashPIX images"; + license = "Flashpix"; + platforms = platforms.all; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 273bdb3136e..cd0a2a3c473 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -9,11 +9,11 @@ assert pythonSupport -> python != null && swig != null; assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "libftdi1-1.1"; + name = "libftdi1-1.2"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "088yh8pxd6q53ssqndydcw1dkq51cjqyahc03lm6iip22cdazcf0"; + sha256 = "1ml8hiahnqm4z0xzyjv8kyrkzvhw6l431c3jndg026cjh9f7ksm6"; }; buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ] diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix index cef34fe6db8..38f94e7992d 100644 --- a/pkgs/development/libraries/libibverbs/default.nix +++ b/pkgs/development/libraries/libibverbs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.openfabrics.org/; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix index dbb104546ad..6292318d5ca 100644 --- a/pkgs/development/libraries/libical/default.nix +++ b/pkgs/development/libraries/libical/default.nix @@ -1,13 +1,25 @@ -{stdenv, fetchurl, perl, cmake}: +{ stdenv, fetchFromGitHub, perl, cmake }: stdenv.mkDerivation rec { - pName = "libical"; - name = "${pName}-1.0"; - src = fetchurl { - url = "mirror://sourceforge/freeassociation/${pName}/${name}/${name}.tar.gz"; - sha256 = "1dy0drz9hy0sn2q3s2lp00jb9bis5gsm7n3m4zga49s9ir2b6fbw"; + name = "libical-${version}"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "libical"; + repo = "libical"; + rev = "v${version}"; + sha256 = "1y6rbw24m133d984pyqzx2bi7f37dsw6f33l6arwn6yd4zlqdib9"; }; + nativeBuildInputs = [ perl cmake ]; patches = [ ./respect-env-tzdir.patch ]; + + meta = with stdenv.lib; { + homepage = https://github.com/libical/libical; + description = "an Open Source implementation of the iCalendar protocols"; + license = licenses.mpl10; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; } diff --git a/pkgs/development/libraries/libical/respect-env-tzdir.patch b/pkgs/development/libraries/libical/respect-env-tzdir.patch index 12da8d41c7b..980a0d5c71a 100644 --- a/pkgs/development/libraries/libical/respect-env-tzdir.patch +++ b/pkgs/development/libraries/libical/respect-env-tzdir.patch @@ -1,21 +1,19 @@ -* Remove /usr/*/zoneinfo from the default search path -* Respect $TZDIR diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c -index adf7598..d2fd5c8 100644 +index fe984c9..22ba0a1 100644 --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c -@@ -108,7 +108,7 @@ typedef struct - - static int r_pos [] = {1, 2, 3, -2, -1}; +@@ -107,7 +107,7 @@ typedef struct + char charcnt[4]; + } tzinfo; -static char *search_paths [] = {"/usr/share/zoneinfo","/usr/lib/zoneinfo","/etc/zoneinfo","/usr/share/lib/zoneinfo"}; +static char *search_paths [] = {"/etc/zoneinfo"}; static char *zdir = NULL; #define NUM_SEARCH_PATHS (sizeof (search_paths)/ sizeof (search_paths [0])) -@@ -195,6 +195,16 @@ set_zonedir (void) +@@ -194,6 +194,16 @@ set_zonedir (void) const char *fname = ZONES_TAB_SYSTEM_FILENAME; - int i; + unsigned int i; + const char *env_tzdir = strdup (getenv ("TZDIR")); + if (env_tzdir) { @@ -27,6 +25,6 @@ index adf7598..d2fd5c8 100644 + free (env_tzdir); + } + - for (i = 0;i < NUM_SEARCH_PATHS; i++) { + for (i = 0; i < NUM_SEARCH_PATHS; i++) { sprintf (file_path, "%s/%s", search_paths [i], fname); if (!access (file_path, F_OK|R_OK)) { diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index a57ff0bb737..80ad7879e10 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-0.11.0"; + name = "libinput-0.13.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0hq7plvf9gpscy69pngffrfzqdrcwvpqr0a8fh45xslm5xwxcz4j"; + sha256 = "06n6ih2bfr957rprsgjxhi6f7m96wmf4kgac8y0ispsjvrzszv3c"; }; configureFlags = [ diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index c6323fcc84a..3af1227c69b 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "liblqr-1-0.4.1"; + name = "liblqr-1-0.4.2"; + src = fetchurl { url = "${meta.homepage}/local--files/en:download-page/${name}.tar.bz2"; - sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz"; + sha256 = "0dzikxzjz5zmy3vnydh90aqk23q0qm8ykx6plz6p4z90zlp84fhp"; }; buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; - configureFlags = "--enable-install-man"; meta = with stdenv.lib; { homepage = http://liblqr.wikidot.com; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 883ad072c7b..7739c3627ec 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -8,7 +8,11 @@ stdenv.mkDerivation rec { sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690"; }; - patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ]; + patches = [ ./001-mips_removal_h_constraint.patch ./pkgconfig.patch ] + # optimize.diff is taken from https://projects.archlinux.org/svntogit/packages.git/tree/trunk/optimize.diff?h=packages/libmad + # It is included here in order to fix a build failure in Clang + # But it may be useful to fix other, currently unknown problems as well + ++ stdenv.lib.optional (stdenv.cc.cc.isClang or false) [ ./optimize.diff ]; nativeBuildInputs = [ autoconf ]; @@ -22,6 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://sourceforge.net/projects/mad/; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; + license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libmad/optimize.diff b/pkgs/development/libraries/libmad/optimize.diff new file mode 100644 index 00000000000..1418dc92707 --- /dev/null +++ b/pkgs/development/libraries/libmad/optimize.diff @@ -0,0 +1,77 @@ +Index: libmad-0.15.1b/configure.ac +=================================================================== +--- libmad-0.15.1b.orig/configure.ac 2008-03-07 20:31:23.000000000 +0000 ++++ libmad-0.15.1b/configure.ac 2008-03-07 20:34:26.000000000 +0000 +@@ -124,71 +124,7 @@ + + if test "$GCC" = yes + then +- if test -z "$arch" +- then +- case "$host" in +- i386-*) ;; +- i?86-*) arch="-march=i486" ;; +- arm*-empeg-*) arch="-march=armv4 -mtune=strongarm1100" ;; +- armv4*-*) arch="-march=armv4 -mtune=strongarm" ;; +- powerpc-*) ;; +- mips*-agenda-*) arch="-mcpu=vr4100" ;; +- mips*-luxsonor-*) arch="-mips1 -mcpu=r3000 -Wa,-m4010" ;; +- esac +- fi +- +- case "$optimize" in +- -O|"-O "*) +- optimize="-O" +- optimize="$optimize -fforce-mem" +- optimize="$optimize -fforce-addr" +- : #x optimize="$optimize -finline-functions" +- : #- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -fthread-jumps" +- optimize="$optimize -fcse-follow-jumps" +- optimize="$optimize -fcse-skip-blocks" +- : #x optimize="$optimize -frerun-cse-after-loop" +- : #x optimize="$optimize -frerun-loop-opt" +- : #x optimize="$optimize -fgcse" +- optimize="$optimize -fexpensive-optimizations" +- optimize="$optimize -fregmove" +- : #* optimize="$optimize -fdelayed-branch" +- : #x optimize="$optimize -fschedule-insns" +- optimize="$optimize -fschedule-insns2" +- : #? optimize="$optimize -ffunction-sections" +- : #? optimize="$optimize -fcaller-saves" +- : #> optimize="$optimize -funroll-loops" +- : #> optimize="$optimize -funroll-all-loops" +- : #x optimize="$optimize -fmove-all-movables" +- : #x optimize="$optimize -freduce-all-givs" +- : #? optimize="$optimize -fstrict-aliasing" +- : #* optimize="$optimize -fstructure-noalias" +- +- case "$host" in +- arm*-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- mips*-*) +- optimize="$optimize -fstrength-reduce" +- optimize="$optimize -finline-functions" +- ;; +- i?86-*) +- optimize="$optimize -fstrength-reduce" +- ;; +- powerpc-apple-*) +- # this triggers an internal compiler error with gcc2 +- : #optimize="$optimize -fstrength-reduce" +- +- # this is really only beneficial with gcc3 +- : #optimize="$optimize -finline-functions" +- ;; +- *) +- # this sometimes provokes bugs in gcc 2.95.2 +- : #optimize="$optimize -fstrength-reduce" +- ;; +- esac +- ;; +- esac ++ optimize="-O2" + fi + + case "$host" in diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 67b9e728955..b4032f3c22d 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -9,12 +9,16 @@ stdenv.mkDerivation rec { }; configurePhase = "cd make/linux"; - makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"; + makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib" + + stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++"; propagatedBuildInputs = [ libebml ]; - meta = { - description = "Matroska library"; - homepage = http://dl.matroska.org/downloads/libmatroska; + meta = with stdenv.lib; { + description = "A library to parse Matroska files"; + homepage = http://matroska.org/; + license = licenses.lgpl21; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 8207051b2a8..d58f031f376 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,23 +1,24 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev }: stdenv.mkDerivation rec { - name = "libmbim-1.6.0"; + name = "libmbim-1.12.2"; src = fetchurl { url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "10mh1b8jfxg6y6nhr7swbi9wx4acjgvx1if7nhrw1ppd5apvvvz0"; + sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; }; preConfigure = '' - for f in build-aux/mbim-codegen/*; do - substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" - done + patchShebangs . ''; - buildInputs = [ pkgconfig glib udev ]; + buildInputs = [ pkgconfig glib udev python ]; meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/software/libmbim/; description = "talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 7ecac071ce4..19d912e5523 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; + # Otherwise clang fails with 'duplicate symbol ___sputc' + buildFlags = stdenv.lib.optionalString stdenv.isDarwin "CFLAGS=-std=gnu89"; + meta = { homepage = http://libmpeg2.sourceforge.net/; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/libmsgpack/default.nix index 4bec67f8513..5b2c7902c3c 100644 --- a/pkgs/development/libraries/libmsgpack/default.nix +++ b/pkgs/development/libraries/libmsgpack/default.nix @@ -1,12 +1,12 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; rev = "cpp-${version}"; - sha256 = "0vkhjil4rh5z9kvjfgzm79kfqwvlimvv49q74wlsjx7vgvv9019d"; + sha256 = "1hnpnin6gjiilbzfd75871kamfn9grrf53qpbs061sflvz56fddq"; }; }) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a0292067dbb..9699d67d7b8 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python }: stdenv.mkDerivation rec { - name = "libqmi-1.8.0"; + name = "libqmi-1.12.6"; src = fetchurl { url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "03gf221yjcdzvnl4v2adwpc6cyg5mlbccn20s00fp5bgvmq81pgs"; + sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; }; preBuild = '' @@ -15,7 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib python ]; meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/libqmi/; description = "Modem protocol helper library"; platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix index 0f5500478b4..843ff62530b 100644 --- a/pkgs/development/libraries/librdmacm/default.nix +++ b/pkgs/development/libraries/librdmacm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.openfabrics.org/; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ wkennington ]; }; diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index aa138613ec4..ef4638eea27 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1fy3x5idx5mnncbzhsw1ahwnh7ram4d05ksz0ipf5x6p7y8pj8x8"; + sha256 = "1a2k6sby6a1d0hf4hns6d13cvyck2i0figbkf1q0301vggcnv0jg"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 808407877e9..9589298ecd5 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco -, gtk2 ? null, gtk3 ? null +, bzip2, libcroco, libintlOrEmpty +, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.36.4"; # 2.37 needs pango 1.32.6, 2.40 doesn't support gtk2 + name = "librsvg-2.40.9"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; - sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; + url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; + sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; }; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango ] + NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; - propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk2 gtk3 ]; + propagatedBuildInputs = [ glib gdk_pixbuf cairo gtk3 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 76daf7d748b..c5a7a7202e2 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -1,22 +1,29 @@ -{stdenv, fetchurl}: +{ stdenv, fetchFromGitHub, autoreconfHook, perl, zlib, bzip2, popt }: -stdenv.mkDerivation { - name = "librsync-0.9.7"; +stdenv.mkDerivation rec { + name = "librsync-${version}"; + version = "1.0.0"; - src = fetchurl { - url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz; - sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; + src = fetchFromGitHub { + owner = "librsync"; + repo = "librsync"; + rev = "v${version}"; + sha256 = "0rc2pksdd0mhdvk8y1yix71rf19wdx1lb2ryrkhi7vcy240rvgvc"; }; + buildInputs = [ autoreconfHook perl zlib bzip2 popt ]; + configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared"; crossAttrs = { dontStrip = true; }; - meta = { + meta = with stdenv.lib; { homepage = http://librsync.sourceforge.net/; - license = stdenv.lib.licenses.lgpl2Plus; + license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index a66d31d2ec4..00655b51afc 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchurl, getopt, bash }: +{ stdenv, fetchFromGitHub, autoreconfHook, getopt }: stdenv.mkDerivation rec { name = "libseccomp-${version}"; - version = "2.1.1"; + version = "2.2.0"; - src = fetchurl { - url = "mirror://sourceforge/libseccomp/libseccomp-${version}.tar.gz"; - sha256 = "0744mjx5m3jl1hzz13zypivl88m0wn44mf5gsrd3yf3w80gc24l8"; + src = fetchFromGitHub { + owner = "seccomp"; + repo = "libseccomp"; + rev = "v${version}"; + sha256 = "0vfd6hx92cp1jaqxxaj30r92bfm6fmamxi2yqxrl82mqism1lk84"; }; - # This fixes the check for 'getopt' to function appropriately. - # Additionally, this package can optionally include the kernel - # headers if they exist, or use its own inline copy of the source - # for talking to the seccomp filter - we opt to always use the - # inline copy + buildInputs = [ autoreconfHook getopt ]; + patchPhase = '' - substituteInPlace ./configure --replace "/bin/bash" "${bash}/bin/bash" - substituteInPlace ./configure --replace "verify_deps getopt" "" - substituteInPlace ./configure --replace getopt ${getopt}/bin/getopt - substituteInPlace ./configure --replace 'opt_sysinc_seccomp="yes"' 'opt_sysinc_seccomp="no"' + patchShebangs . ''; - meta = { + meta = with stdenv.lib; { description = "high level library for the Linux Kernel seccomp filter"; homepage = "http://sourceforge.net/projects/libseccomp"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.lgpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice wkennington ]; }; } diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix new file mode 100644 index 00000000000..9b6e87bd57e --- /dev/null +++ b/pkgs/development/libraries/libsvm/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "libsvm-${version}"; + version = "3.20"; + + src = fetchurl { + url = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz"; + sha256 = "1gj5v5zp1qnsnv0iwxq0ikhf8262d3s5dq6syr6yqkglps0284hg"; + }; + + buildPhase = '' + make + make lib + ''; + + installPhase = let + libSuff = if stdenv.isDarwin then "dylib" else "so"; + in '' + mkdir -p $out/lib $out/bin $out/include; + cp libsvm.so.2 $out/lib/libsvm.2.${libSuff}; + ln -s $out/lib/libsvm.2.${libSuff} $out/lib/libsvm.${libSuff}; + cp svm-scale svm-train svm-predict $out/bin; + cp svm.h $out/include; + ''; + + postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id libsvm.2.dylib $out/lib/libsvm.2.dylib; + ''; + + meta = with stdenv.lib; { + description = "A library for support vector machines"; + homepage = "http://www.csie.ntu.edu.tw/~cjlin/libsvm/"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index cb936747417..ef7a8ab09a8 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool}: +{stdenv, fetchurl, libogg, libvorbis, tremor, autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation ({ name = "libtheora-1.1.1"; @@ -7,12 +7,28 @@ stdenv.mkDerivation ({ sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0"; }; + buildInputs = [pkgconfig]; + propagatedBuildInputs = [libogg libvorbis]; + # GCC's -fforce-addr flag is not supported by clang + # It's just an optimization, so it's safe to simply remove it + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-fforce-addr" "" + ''; + crossAttrs = { propagatedBuildInputs = [libogg.crossDrv tremor.crossDrv]; configureFlags = "--disable-examples"; }; + + meta = with stdenv.lib; { + homepage = http://www.theora.org/; + description = "Library for Theora, a free and open video compression format"; + license = licenses.bsd3; + maintainers = [ maintainers.spwhitt ]; + platforms = platforms.unix; + }; } # It has an old config.guess that doesn't know the mips64el. diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 75139ea988b..c39deba765d 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xz}: +{ stdenv, fetchurl, xz }: stdenv.mkDerivation rec { name = "libunwind-1.1"; @@ -16,8 +16,10 @@ stdenv.mkDerivation rec { touch "$out/lib/libunwind-generic.so" ''; - meta = { + meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0f09af30b0a..dc648e1ea2e 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libX11, pkgconfig, libXext, mesa, libdrm, libXfixes, wayland, libffi }: stdenv.mkDerivation rec { - name = "libva-1.5.0"; + name = "libva-1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "11ilp32fy7s42ii2dlcnf7305r9pi610r3jqdbn26khf26rx8ip9"; + sha256 = "01d01mm9fgpwzqycmjjcj3in3vvzcibi3f64icsw2sksmmgb4495"; }; buildInputs = [ libX11 libXext pkgconfig mesa libdrm libXfixes wayland libffi ]; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index dfb3575b89b..4da60397444 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-0.9"; + name = "libvdpau-1.1"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3"; + sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f"; }; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 80381743100..5d3218169d9 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg, pkgconfig }: stdenv.mkDerivation rec { - name = "libvorbis-1.3.4"; + name = "libvorbis-1.3.5"; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; + sha256 = "1lg1n3a6r41492r7in0fpvzc7909mc5ir9z0gd3qh2pz4yalmyal"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index ce8a58be7f4..6da1b00ee81 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libwebp-${version}"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz"; - sha256 = "0bbjl5spgq7jq7ms5q0scxg5hmg4dd386syb3di4jzggqbbjbn0l"; + sha256 = "1i4hfczjm3b1qj1g4cc9hgb69l47f3nkgf6hk7nz4dm9zmc0vgpg"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix index f2a903a21da..c900cfbc684 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, libjpeg, libpng12, libX11, zlib }: +{ stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }: let version = "3.5.0.31"; in stdenv.mkDerivation { @@ -17,11 +17,10 @@ stdenv.mkDerivation { maintainers = with maintainers; [ nckx ]; }; - buildInputs = [ autoconf libjpeg libpng12 libX11 zlib ]; + buildInputs = [ autoreconfHook libjpeg libpng12 libX11 zlib ]; - preConfigure = '' + preAutoreconf = '' cd nxcomp/ - autoconf ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/nettle/27.nix b/pkgs/development/libraries/nettle/27.nix new file mode 100644 index 00000000000..fc85f5eb9de --- /dev/null +++ b/pkgs/development/libraries/nettle/27.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "2.7.1"; + + src = fetchurl { + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; + }; +}) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 8f731233aa9..a6aae14e5c3 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,67 +1,10 @@ -{ fetchurl, stdenv, gmp, gnum4 }: +{ callPackage, fetchurl, ... } @ args: -stdenv.mkDerivation (rec { - name = "nettle-2.7.1"; +callPackage ./generic.nix (args // rec { + version = "3.0"; src = fetchurl { - url = "mirror://gnu/nettle/${name}.tar.gz"; - sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; + url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; + sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn"; }; - - buildInputs = [ gnum4 ]; - propagatedBuildInputs = [ gmp ]; - - doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); - - enableParallelBuilding = true; - - # It doesn't build otherwise - dontDisableStatic = true; - - patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") - ./cygwin.patch; - - meta = { - description = "Cryptographic library"; - - longDescription = '' - Nettle is a cryptographic library that is designed to fit - easily in more or less any context: In crypto toolkits for - object-oriented languages (C++, Python, Pike, ...), in - applications like LSH or GNUPG, or even in kernel space. In - most contexts, you need more than the basic cryptographic - algorithms, you also need some way to keep track of available - algorithms, their properties and variants. You often have - some algorithm selection process, often dictated by a protocol - you want to implement. - - And as the requirements of applications differ in subtle and - not so subtle ways, an API that fits one application well can - be a pain to use in a different context. And that is why - there are so many different cryptographic libraries around. - - Nettle tries to avoid this problem by doing one thing, the - low-level crypto stuff, and providing a simple but general - interface to it. In particular, Nettle doesn't do algorithm - selection. It doesn't do memory allocation. It doesn't do any - I/O. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - - homepage = http://www.lysator.liu.se/~nisse/nettle/; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; - }; -} - -// - -stdenv.lib.optionalAttrs stdenv.isSunOS { - # Make sure the right <gmp.h> is found, and not the incompatible - # /usr/include/mp.h from OpenSolaris. See - # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> - # for details. - configureFlags = [ "--with-include-path=${gmp}/include" ]; }) diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix new file mode 100644 index 00000000000..76629c80b96 --- /dev/null +++ b/pkgs/development/libraries/nettle/generic.nix @@ -0,0 +1,68 @@ +{ stdenv, gmp, gnum4 + +# Version specific args +, version, src +, ...}: + +stdenv.mkDerivation (rec { + name = "nettle-${version}"; + + inherit src; + + buildInputs = [ gnum4 ]; + propagatedBuildInputs = [ gmp ]; + + doCheck = (stdenv.system != "i686-cygwin" && !stdenv.isDarwin); + + enableParallelBuilding = true; + + # It doesn't build otherwise + dontDisableStatic = true; + + patches = stdenv.lib.optional (stdenv.system == "i686-cygwin") + ./cygwin.patch; + + meta = { + description = "Cryptographic library"; + + longDescription = '' + Nettle is a cryptographic library that is designed to fit + easily in more or less any context: In crypto toolkits for + object-oriented languages (C++, Python, Pike, ...), in + applications like LSH or GNUPG, or even in kernel space. In + most contexts, you need more than the basic cryptographic + algorithms, you also need some way to keep track of available + algorithms, their properties and variants. You often have + some algorithm selection process, often dictated by a protocol + you want to implement. + + And as the requirements of applications differ in subtle and + not so subtle ways, an API that fits one application well can + be a pain to use in a different context. And that is why + there are so many different cryptographic libraries around. + + Nettle tries to avoid this problem by doing one thing, the + low-level crypto stuff, and providing a simple but general + interface to it. In particular, Nettle doesn't do algorithm + selection. It doesn't do memory allocation. It doesn't do any + I/O. + ''; + + license = stdenv.lib.licenses.gpl2Plus; + + homepage = http://www.lysator.liu.se/~nisse/nettle/; + + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} + +// + +stdenv.lib.optionalAttrs stdenv.isSunOS { + # Make sure the right <gmp.h> is found, and not the incompatible + # /usr/include/mp.h from OpenSolaris. See + # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html> + # for details. + configureFlags = [ "--with-include-path=${gmp}/include" ]; +}) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a9c7d51923b..d86a55b78bd 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.17.4"; + version = "3.18"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/${name}.tar.gz"; - sha256 = "1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/${name}.tar.gz"; + sha256 = "0h0xy9kvd2s8r438q4dfn25cgvv5dc1hkm9lb4bgrxpr5bxv13b1"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index a89965d0467..03e7718a3ae 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, readline, mysql, postgresql, sqlite}: +{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }: stdenv.mkDerivation rec { - name = "opendbx-1.4.4"; + name = "opendbx-1.4.6"; + src = fetchurl { url = "http://linuxnetworks.de/opendbx/download/${name}.tar.gz"; - sha256 = "1pc70l54kkdakdw8njr2pnbcghq7fn2bnk97wzhac2adwdkjp7vs"; + sha256 = "0z29h6zx5f3gghkh1a0060w6wr572ci1rl2a3480znf728wa0ii2"; }; preConfigure = '' - export CPPFLAGS="-I${mysql}/include/mysql" - export LDFLAGS="-L${mysql}/lib/mysql" + export CPPFLAGS="-I${mysql.lib}/include/mysql" + export LDFLAGS="-L${mysql.lib}/lib/mysql" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; - buildInputs = [readline mysql postgresql sqlite]; + buildInputs = [ readline mysql.lib postgresql sqlite ]; } diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch new file mode 100644 index 00000000000..af6669c16a4 --- /dev/null +++ b/pkgs/development/libraries/openexr/bootstrap.patch @@ -0,0 +1,15 @@ +diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap +--- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 ++++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400 +@@ -47,11 +47,6 @@ + fi + } + +-# Check if /usr/local/share/aclocal exists +-if [ -d /usr/local/share/aclocal ]; then +- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" +-fi +- + run_cmd aclocal -I m4 $ACLOCAL_INCLUDE + run_cmd $LIBTOOLIZE --automake --copy + run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index fcb27c2c0cc..63a8c11a341 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig ]; propagatedBuildInputs = [ ilmbase zlib ]; + + patches = [ ./bootstrap.patch ]; meta = with stdenv.lib; { homepage = http://www.openexr.com/; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index a635f68839b..4ffcd62f982 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { Name: openjp2 Description: JPEG2000 library (Part 1 and 2) URL: http://www.openjpeg.org/ - Version: @OPENJPEG_VERSION@ + Version: ${version} Libs: -L$out/lib -lopenjp2 Cflags: -I$out/include EOF diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 45ca9cb98e8..87187667a92 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation rec { sha256 = "01rdzjh68w8l5zn0648yibyarj8p6g7yfn59nw5awaz1i8dvbnqq"; }; - buildInputs = with stdenv.lib; - optional (!stdenv.isDarwin) gobjectIntrospection # build problems of itself and flex + buildInputs = with stdenv.lib; [ gobjectIntrospection ] ++ optionals stdenv.isDarwin [ fontconfig ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index d93341b81ff..14529c6c643 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; + patches = stdenv.lib.optional (stdenv.cc.cc.isClang or false) ./fix-clang36.patch; + meta = { homepage = http://pixman.org; description = "A low-level library for pixel manipulation"; diff --git a/pkgs/development/libraries/pixman/fix-clang36.patch b/pkgs/development/libraries/pixman/fix-clang36.patch new file mode 100644 index 00000000000..7db3c7ecaba --- /dev/null +++ b/pkgs/development/libraries/pixman/fix-clang36.patch @@ -0,0 +1,11 @@ +--- a/pixman/pixman-mmx.c 2014-04-24 08:34:14.000000000 +0400 ++++ b/pixman/pixman-mmx.c 2015-01-30 20:19:28.000000000 +0300 +@@ -89,7 +89,7 @@ + return __A; + } + +-# ifdef __OPTIMIZE__ ++# if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6) + extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__)) + _mm_shuffle_pi16 (__m64 __A, int8_t const __N) + { diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 2c310603b78..c79cdfd4466 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,83 +1,50 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconv, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, qt4Support ? false, qt4 ? null, qt5 +, qt4Support ? false, qt4 ? null, qt5Support ? false, qt5 ? null +, utils ? false, suffix ? "glib" }: let - version = "0.28.1"; # even major numbers are stable - sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; - - # This is for Okular (and similar) to support subpixel rendering. - # It's kept from upstream because of political reasons. - qtcairo_patch = fetchpatch { - url = "https://github.com/giddie/poppler-qt4-cairo-backend/compare/" - + "fa1d636...b30f96c.diff"; # update to current maint...qt4-lcd - sha256 = "0g18y247k2vcz1n56rnfpy226f22v4r9c7pk8cf2h9l12vz2qxkm"; + version = "0.32.0"; # even major numbers are stable + sha256 = "162vfbvbz0frvqyk00ldsbl49h4bj8i8wn0ngfl30xg1lldy6qs9"; +in +stdenv.mkDerivation rec { + name = "poppler-${suffix}-${version}"; + + src = fetchurl { + url = "${meta.homepage}/poppler-${version}.tar.xz"; + inherit sha256; }; - poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ - rec { - name = "poppler-${nameSuff}-${version}"; - - src = fetchurl { - url = "${meta.homepage}/poppler-${version}.tar.xz"; - inherit sha256; - }; - - propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; - - nativeBuildInputs = [ pkgconfig cmake libiconv ] ++ libintlOrEmpty; - - cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; - - patches = [ ./datadir_env.patch ./poppler-glib.patch ]; + patches = [ ./datadir_env.patch ]; - # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files - # such as `../../../test/unittestcases/UseNone.pdf'. - #doCheck = !qt4Support; - checkTarget = "test"; + propagatedBuildInputs = with stdenv.lib; + [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ] + ++ optional qt4Support qt4 + ++ optional qt5Support qt5.base; - enableParallelBuilding = true; + nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; - meta = { - homepage = http://poppler.freedesktop.org/; - description = "A PDF rendering library"; + configureFlags = + [ + "--enable-xpdf-headers" + "--enable-libcurl" + "--enable-zlib" + ] + ++ stdenv.lib.optional (!utils) "--disable-utils"; - longDescription = '' - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - ''; + enableParallelBuilding = true; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - }; - } merge ]); # poppler_drv + meta = { + homepage = http://poppler.freedesktop.org/; + description = "A PDF rendering library"; - /* We always use cairo in poppler, so we always depend on glib, - so we always build the glib wrapper (~350kB). - We also always build the cpp wrapper (<100kB). - ToDo: around half the size could be saved by splitting out headers and tools (1.5 + 0.5 MB). - */ - - poppler_glib = poppler_drv "glib" { }; - - poppler_qt4 = poppler_drv "qt4" { - #patches = [ qtcairo_patch ]; # text rendering artifacts in recent versions - propagatedBuildInputs = [ qt4 poppler_glib ]; - NIX_LDFLAGS = "-lpoppler"; - postConfigure = '' - mkdir -p "$out/lib/pkgconfig" - install -c -m 644 poppler-qt4.pc "$out/lib/pkgconfig" - cd qt4 + longDescription = '' + Poppler is a PDF rendering library based on the xpdf-3.0 code base. ''; - }; - poppler_qt5 = poppler_drv "qt5" { - propagatedBuildInputs = [ qt5.base poppler_glib ]; - postConfigure = '' - mkdir -p "$out/lib/pkgconfig" - install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig" - cd qt5 - ''; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; - -in { inherit poppler_glib poppler_qt4 poppler_qt5; } // poppler_glib +} diff --git a/pkgs/development/libraries/poppler/poppler-glib.patch b/pkgs/development/libraries/poppler/poppler-glib.patch deleted file mode 100644 index 09f5a145b84..00000000000 --- a/pkgs/development/libraries/poppler/poppler-glib.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -rupN a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake ---- a/poppler-glib.pc.cmake 2013-08-17 01:20:41.000000001 +0200 -+++ b/poppler-glib.pc.cmake 2014-01-01 09:30:50.000000001 +0100 -@@ -10,4 +10,4 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go - @PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-glib --Cflags: -I${includedir}/poppler/glib -+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler -diff -rupN a/poppler-glib.pc.in b/poppler-glib.pc.in ---- a/poppler-glib.pc.in 2013-08-17 01:20:41.000000001 +0200 -+++ b/poppler-glib.pc.in 2014-01-01 09:27:17.000000001 +0100 -@@ -10,4 +10,5 @@ Requires: glib-2.0 >= @GLIB_REQUIRED@ go - @PC_REQUIRES_PRIVATE@ - - Libs: -L${libdir} -lpoppler-glib --Cflags: -I${includedir}/poppler/glib -+Cflags: -I${includedir}/poppler/glib -I${includedir}/poppler -+ diff --git a/pkgs/development/libraries/protobufc/1.1.nix b/pkgs/development/libraries/protobufc/1.1.nix index 228225b721d..97fc8642778 100644 --- a/pkgs/development/libraries/protobufc/1.1.nix +++ b/pkgs/development/libraries/protobufc/1.1.nix @@ -1,11 +1,11 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "protobuf-c"; repo = "protobuf-c"; rev = "v${version}"; - sha256 = "11j9vg55a732v14cki4721ipr942c4krr562gliqmnlwvyz0hlyb"; + sha256 = "0mdl2i87394l4zdvq2npsxq4zs8p7sqhqmbm2r380ngjs6zic6gw"; }; }) diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 952bdfa29ce..7890017b55b 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -1,32 +1,18 @@ -{ stdenv, fetchurl, which, qt4 }: +{ stdenv, fetchurl, cmake, pkgconfig, qt }: stdenv.mkDerivation rec { - name = "qca-2.0.3"; - + name = "qca-2.1.0"; + src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.bz2"; - sha256 = "0pw9fkjga8vxj465wswxmssxs4wj6zpxxi6kzkf4z5chyf4hr8ld"; + url = "http://delta.affinix.com/download/qca/2.0/${name}.tar.gz"; + sha256 = "114jg97fmg1rb4llfg7x7r68lxdkjrx60qsqq76khdwc2dvcsv92"; }; - - buildInputs = [ qt4 ]; - - nativeBuildInputs = [ which ]; - - preBuild = - '' - sed -i include/QtCrypto/qca_publickey.h -e '/EMSA3_Raw/a,\ - EMSA3_SHA224, ///< SHA224, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA256, ///< SHA256, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA384, ///< SHA384, with EMSA3 (ie PKCS#1 Version 1.5) encoding\ - EMSA3_SHA512 ///< SHA512, with EMSA3 (ie PKCS#1 Version 1.5) encoding' - ''; - patches = [ ./gcc47.patch ]; - - configureFlags = "--no-separate-debug-info"; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qt ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; diff --git a/pkgs/development/libraries/qca2/gcc47.patch b/pkgs/development/libraries/qca2/gcc47.patch deleted file mode 100644 index 08711884a57..00000000000 --- a/pkgs/development/libraries/qca2/gcc47.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Thanks to http://lists.pld-linux.org/mailman/pipermail/pld-cvs-commit/Week-of-Mon-20120917/347917.html ---- qca-2.0.3/src/botantools/botan/botan/secmem.h.orig 2007-04-19 23:26:13.000000000 +0200 -+++ qca-2.0.3/src/botantools/botan/botan/secmem.h 2012-09-16 23:28:43.767480490 +0200 -@@ -214,7 +214,7 @@ - - SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); } - SecureVector(const T in[], u32bit n) -- { MemoryRegion<T>::init(true); set(in, n); } -+ { MemoryRegion<T>::init(true); this->set(in, n); } - SecureVector(const MemoryRegion<T>& in) - { MemoryRegion<T>::init(true); set(in); } - SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2) diff --git a/pkgs/development/libraries/qca2/ossl.nix b/pkgs/development/libraries/qca2/ossl.nix deleted file mode 100644 index d2b8778aa14..00000000000 --- a/pkgs/development/libraries/qca2/ossl.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, fetchgit, qt4, qca2, openssl, which}: - -stdenv.mkDerivation rec { - version = "2.0.0-beta3"; - name = "qca-ossl-${version}"; - src = fetchurl { - url = "http://delta.affinix.com/download/qca/2.0/plugins/${name}.tar.bz2"; - sha256 = "0yy68racvx3clybry2i1bw5bz9yhxr40p3xqagxxb15ihvsrzq08"; - }; - # SVN version has stabilized and has a lot of fixes for fresh OpenSSL - # Take the main source from there - git_src = fetchgit { - url = git://anongit.kde.org/qca; - rev = "0a8b9db6613f2282fe492ff454412f502a6be410"; - sha256 = "1ebb97092f21b9152c6dda56cb33795bea4e83c82800848e800ddaaaf23a31e1"; - }; - buildInputs = [ qt4 qca2 openssl ]; - nativeBuildInputs = [ which ]; - dontAddPrefix = true; - configureFlags="--no-separate-debug-info --with-qca=${qca2} - --with-openssl-inc=${openssl}/include --with-openssl-lib=${openssl}/lib"; - preConfigure='' - cp ${git_src}/plugins/qca-ossl/qca-ossl.cpp . - - configureFlags="$configureFlags --plugins-path=$out/lib/qt4/plugins" - ''; - meta = with stdenv.lib; { - description = "Qt Cryptographic Architecture OpenSSL plugin"; - license = "LGPL"; - homepage = http://delta.affinix.com/qca; - maintainers = [ maintainers.urkud ]; - }; -} diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 432b4358f7a..ffad4418815 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { -I${randrproto}/include" else "-no-xrandr"} ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"} ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""} - ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""} + ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft}/lib -I${libXft}/include -L${libXft.freetype}/lib -I${libXft.freetype}/include diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index a8d8beb4145..06ff3fe66d4 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { # The following libraries are only used in plugins buildInputs = [ cups # Qt dlopen's libcups instead of linking to it - mysql postgresql sqlite libjpeg libmng libtiff icu ] + mysql.lib postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals gtkStyle [ gtk gdk_pixbuf ]; nativeBuildInputs = [ perl pkgconfig which ]; diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 98fd20c44c0..d7ae685af6d 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -153,7 +153,7 @@ stdenv.mkDerivation rec { # doesn't remain a runtime-dep if not used ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups - ++ optional (mysql != null) mysql + ++ optional (mysql != null) mysql.lib ++ optional (postgresql != null) postgresql; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 45de927bc8d..bc342f605bc 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { # doesn't remain a runtime-dep if not used ++ optionals mesaSupported [ mesa mesa_glu ] ++ optional (cups != null) cups - ++ optional (mysql != null) mysql + ++ optional (mysql != null) mysql.lib ++ optional (postgresql != null) postgresql; buildInputs = [ gdb bison flex gperf ruby ]; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 8ba2d52741f..0ab4f21f2d8 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = version; - sha256 = "0qx5dnq9halqaznmbwg44p1wl64pzl485r4054569rbx9y9ak1zy"; + sha256 = "0iklvslz35dd0lz26ffrbfb20qirl9v5kcdmlcnnzc034hr2zmnv"; }; buildInputs = [ zlib perl ]; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 67f026fb482..c80b1bca685 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -1,11 +1,28 @@ -{stdenv, fetchurl, liboil, pkgconfig}: +{stdenv, fetchurl, orc, pkgconfig}: stdenv.mkDerivation { - name = "schroedinger-1.0.0"; + name = "schroedinger-1.0.11"; + src = fetchurl { - url = mirror://sourceforge/schrodinger/schroedinger-1.0.0.tar.gz; - sha256 = "0r374wvc73pfzkcpwk0q0sjx6yhp79acyiqbjy3c7sfqdy7sm4x8"; + url = http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz; + sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; - buildInputs = [liboil pkgconfig]; + buildInputs = [orc pkgconfig]; + + # The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11. + # A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See: + # http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html + preBuild = '' + substituteInPlace Makefile \ + --replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \ + --replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools" + ''; + + meta = with stdenv.lib; { + homepage = "http://diracvideo.org/"; + maintainers = [ maintainers.spwhitt ]; + license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 5443a53bc9c..544ab215345 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip, blas, liblapack, gfortran }: stdenv.mkDerivation rec { - version = "3.12.0"; + version = "3.12.1"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "18p1ad64mpliba1hf6jkyyrd0srxsqivwbcnbrr09jfpn4jn4bbr"; + sha256 = "0x0wcc21d2bfs3zq8nvhva1nv7xi86wjbyixvvxvcrg2kqjlybdy"; }; preConfigure = '' diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix new file mode 100644 index 00000000000..57124f575a1 --- /dev/null +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sfsexp-${version}"; + version = "1.3"; + + src = fetchurl { + url = "mirror://sourceforge/sexpr/sexpr-${version}.tar.gz"; + sha256 = "18gdwxjja0ip378hlzs8sp7q2g6hrmy7x10yf2wnxfmmylbpqn8k"; + }; + + meta = with stdenv.lib; { + description = "Small, fast s-expression library"; + homepage = "http://sexpr.sourceforge.net/"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index 67c1c74e6cf..fa1d4f4f984 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.2.0.0"; + version = "2.3.2.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "1ww45ygrws7h3p3p7y3blc5kzvvy5fmzb158ngfbdamf0pgc5vkn"; + sha256 = "1l7f2zmas0w28j19g46bvm13j3cx7jimxifivd04zz5r7g79ik5a"; }; dontDisableStatic = true; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 9aad51f9fad..d9f52d8d87c 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postInstall = '' + ar qf $out/lib/libtalloc.a bin/default/talloc_5.o + ''; + meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index 03769815a3e..74a14231801 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -64,8 +64,8 @@ args : with args; md5 = "a484f590464fb823a8f821b2f1fd7fef"; }; configureFlags = "--disable-gui" - + " --with-mysql-path=${mysql} --with-unixODBC=${unixODBC}"; - buildInputs = [libtool zlib]; + + " --with-mysql-path=${mysql.lib} --with-unixODBC=${unixODBC}"; + buildInputs = [ libtool zlib ]; inherit mysql unixODBC; }; ini = diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 7f05daab021..f970a63ff12 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.6"; + version = "0.7"; src = fetchurl { url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf"; + sha256 = "1ah64271r83lvh8hrpkxzv0iwpga1wkrfkx4rkljpijx5dqs0qqa"; }; buildInputs = [ pkgconfig libusb ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index f4d87e8effa..8eddb2b0ae8 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdrm, libva, libX11, intel-gpu-tools, mesa_noglu, wayland, python, gnum4 }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.5.0"; + name = "libva-intel-driver-1.5.1"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "1p537n2dpmybpf7rligbnhw406lr575bhkafs4n64jxk78clid6h"; + sha256 = "1p7aw0wmb6z3rbbm3bqlp6rxw41kii23csbjmcvbbk037lq6rnqb"; }; prePatch = '' diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 4bfcd356949..8a63b780b4c 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "Hybrid audio compression format"; homepage = http://www.wavpack.com/; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; }; } diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 51666e3ba6d..6c541f1aa68 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, yasm}: +{stdenv, fetchurl, yasm, enable10bit ? false}: stdenv.mkDerivation rec { - version = "snapshot-20130424-2245-stable"; - name = "x264-20130424_2245"; + version = "snapshot-20141218-2245-stable"; + name = "x264-20141218-2245"; src = fetchurl { url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2"; - sha256 = "0vzyqsgrm9k3hzka2p8ib92jl0ha8d4267r2rb3pr9gmpjaj9azk"; + sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m"; }; patchPhase = '' @@ -14,13 +14,16 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" + ++ stdenv.lib.optional (enable10bit) "--bit-depth=10"; buildInputs = [ yasm ]; - meta = { + meta = with stdenv.lib; { description = "library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; - license = "GPL"; + homepage = http://www.videolan.org/developers/x264.html; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.spwhitt ]; }; } diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 602e7115017..82f1514cd3d 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = http://xlslib.sourceforge.net/; + homepage = http://sourceforge.net/projects/xlslib/files/; license = licenses.bsd2; platforms = platforms.unix; maintainers = maintainers.abbradar; diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index 064ea840e26..e423344fb16 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -193,7 +193,7 @@ let lispPackages = rec { version = "git-20141112"; description = "Common Lisp SQL Interface library"; deps = [uffi]; - buildInputs = [pkgs.mysql pkgs.zlib]; + buildInputs = [pkgs.mysql.lib pkgs.zlib]; # Source type: git src = pkgs.fetchgit { url = ''http://git.b9.com/clsql.git''; @@ -202,8 +202,8 @@ let lispPackages = rec { }; overrides = x:{ preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql}/include/mysql" - export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql}/lib/mysql" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.mysql.lib}/include/mysql" + export NIX_LDFLAGS="$NIX_LDFLAGS -L${pkgs.mysql.lib}/lib/mysql" ''; }; }; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 8c3c4275837..2fbbabfd36b 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { createFindlibDestdir = true; + preInstall = "make doc"; + meta = { homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; platforms = ocaml.meta.platforms; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 0ae60ab07e4..4ffef60c4bf 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation { "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" ]; - buildInputs = [ocaml findlib mysql]; + buildInputs = [ocaml findlib mysql.lib ]; createFindlibDestdir = true; - propagatedbuildInputs = [mysql]; + propagatedbuildInputs = [ mysql.lib ]; preConfigure = '' - export LDFLAGS="-L${mysql}/lib/mysql" + export LDFLAGS="-L${mysql.lib}/lib/mysql" ''; buildPhase = '' diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 92b70a8cd1b..ba0ce29bdf9 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + homepage = http://ounit.forge.ocamlcore.org/; description = "Unit test framework for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix index a7464893cbb..273cc0e44f2 100644 --- a/pkgs/development/perl-modules/DBD-mysql/default.nix +++ b/pkgs/development/perl-modules/DBD-mysql/default.nix @@ -1,15 +1,17 @@ -{fetchurl, buildPerlPackage, DBI, mysql}: +{ fetchurl, buildPerlPackage, DBI, mysql }: -buildPerlPackage { - name = "DBD-mysql-4.023"; +buildPerlPackage rec { + name = "DBD-mysql-4.031"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPTTOFU/DBD-mysql-4.023.tar.gz; - sha256 = "0j4i0i6apjwx5klk3wigh6yysssn7bs6p8c5sh31m6qxsbgyk9xa"; + url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz"; + sha256 = "1lngnkfi71gcpfk93xhil2x9i3w3rqjpxlvn5n92jd5ikwry8bmf"; }; - buildInputs = [mysql] ; - propagatedBuildInputs = [DBI]; + buildInputs = [ mysql.lib ] ; + propagatedBuildInputs = [ DBI ]; + + doCheck = false; # makeMakerFlags = "MYSQL_HOME=${mysql}"; } diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index e647dfc809f..aa5deb6d6db 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { homepage = http://graph-tool.skewed.de/; license = licenses.gpl3; platforms = platforms.all; + maintainer = [ stdenv.lib.maintainers.joelmo ]; }; src = fetchurl { diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f662c26fe42..c3572bfd0a0 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -267,6 +267,7 @@ let rgeos = [ pkgs.geos ]; rgl = [ pkgs.mesa pkgs.x11 ]; Rglpk = [ pkgs.glpk ]; + rggobi = [ pkgs.ggobi pkgs.gtk2 pkgs.libxml2 ]; RGtk2 = [ pkgs.gtk2 ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; ridge = [ pkgs.gsl ]; @@ -277,7 +278,7 @@ let rmatio = [ pkgs.zlib ]; Rmpfr = [ pkgs.gmp pkgs.mpfr ]; Rmpi = [ pkgs.openmpi ]; - RMySQL = [ pkgs.zlib pkgs.mysql ]; + RMySQL = [ pkgs.zlib pkgs.mysql.lib ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; @@ -339,6 +340,7 @@ let WideLM = [ pkgs.cudatoolkit ]; RCurl = [ pkgs.curl ]; R2SWF = [ pkgs.pkgconfig ]; + rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; RProtoBuf = [ pkgs.pkgconfig ]; Rpoppler = [ pkgs.pkgconfig ]; @@ -434,6 +436,7 @@ let "PBSadmb" "PBSmodelling" "PCPS" + "PKgraph" "PopGenReport" "PredictABEL" "PrevMap" @@ -662,9 +665,9 @@ let "babel" # requires edgeR "BACA" # requires RDAVIDWebService "BcDiag" # requires fabia + "beadarrayMSV" # requires Biobase, geneplotter, andlimma "bdvis" # requres taxize "beadarrayFilter" # requires beadarray - "beadarrayMSV" # requires rggobi "bigGP" # requires MPI running. HELP WANTED! "bigpca" # requires NCmisc "Biograph" # requires mvna @@ -678,9 +681,9 @@ let "CARrampsOcl" # depends on OpenCL "CHAT" # requires DNAcopy "ChemoSpec" # depends on broken speaq + "Crossover" # fails self-test "classGraph" # requires graph, and Rgraphviz "clpAPI" # requires clp - "clusterfly" # requires rggobi "compendiumdb" # requires Biobase "CORM" # requires limma "cplexAPI" # requires CPLEX @@ -729,9 +732,11 @@ let "GeneticTools" # requires snpStats "GExMap" # requires Biobase and multtest "gitter" # requires EBImage + "glmgraph" # test suite says: "undefined symbol: dgemv_" "gmatrix" # depends on proprietary cudatoolkit "GOGANPA" # requires WGCNA "gputools" # depends on proprietary cudatoolkit + "gMCP" # fails self-test "gRain" # requires gRbase "gRapHD" # requires graph "gRbase" # requires RBGL, and graph @@ -796,6 +801,7 @@ let "NCmisc" # requires BiocInstaller "netClass" # requires samr "nettools" # requires WGCNA + "NORRRM" # can't load SDMTools properly "netweavers" # requires BiocGenerics, Biobase, and limma "NLPutils" # requires qdap "NSA" # requires aroma_core @@ -803,6 +809,9 @@ let "optBiomarker" # requires rpanel "ora" # requires ROracle "orQA" # requires genefilter + "pRF" # requires multtest + "PBSmapping" # fails its test suite for unclear reasons + "PBSddesolve" # fails its test suite for unclear reasons "PairViz" # requires graph "PANDA" # requires GO.db "ParDNAcopy" # requires DNAcopy @@ -821,7 +830,6 @@ let "permGPU" # requires Biobase "PhViD" # requires LBE "pi0" # requires qvalue - "PKgraph" # requires rggobi "plmDE" # requires limma "plsRcox" # requires survcomp "PMA" # requires impute @@ -844,6 +852,7 @@ let "rainfreq" # SDMTools.so: undefined symbol: X "RAM" # requires Heatplus "RAPIDR" # requires Biostrings, Rsamtools, and GenomicRanges + "RapidPolygonLookup" # depends on broken PBSmapping "RbioRXN" # requires fmcsR, and KEGGREST "RcppAPT" # configure script depends on /bin/sh "RcmdrPlugin_seeg" # requires seeg @@ -855,7 +864,6 @@ let "REBayes" # requires Rmosek "RefFreeEWAS" # requires isva "retistruct" # depends on broken RImageJROI - "rggobi" # requires GGobi "RImageJROI" # requires spatstat "rjade" # requires V8 to build "rJPSGCS" # requires chopsticks @@ -872,6 +880,8 @@ let "rpanel" # I could not make Tcl to recognize BWidget. HELP WANTED! "RQuantLib" # requires QuantLib "RSAP" # requires SAPNWRFCSDK + "rgp" # fails self-test + "rgpui" # depends on broken rgp "RSeed" # requires RBGL, and graph "rsig" # requires survcomp "RSNPset" # requires qvalue @@ -886,7 +896,6 @@ let "selectspm" # depends on broken ecespa "semiArtificial" # requires RSNNS "SeqFeatR" # requires Biostrings, qvalue, and widgetTools - "SeqGrapheR" # requires rggobi "sequenza" # requires copynumber "SGCS" # requires spatstat "siar" # requires spatstat @@ -908,6 +917,8 @@ let "spocc" # requires leafletR "SQDA" # requires limma "Statomica" # requires Biobase, multtest + "stagePop" # depends on broken PBSddesolve + "SeqGrapheR" # depends on Biostrings "stpp" # requires spatstat "structSSI" # requires multtest "strum" # requires Rgraphviz @@ -923,6 +934,7 @@ let "ttScreening" # requires sva, and limma "V8" # compilation error "vows" # requires rpanel + "vmsbase" # depends on broken PBSmapping "WGCNA" # requires impute "wgsea" # requires snpStats "WideLM" # depends on proprietary cudatoolkit @@ -999,7 +1011,7 @@ let RMySQL = old.RMySQL.overrideDerivation (attrs: { patches = [ ./patches/RMySQL.patch ]; - MYSQL_DIR="${pkgs.mysql}"; + MYSQL_DIR="${pkgs.mysql.lib}"; }); devEMF = old.devEMF.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index f9406279b5d..c3381186aa8 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, cmake, llvmPackages }: +{ stdenv, fetchurl, cmake, llvmPackages_35 }: -with llvmPackages; - -let version = "3.5"; in +let version = "3.5"; in with llvmPackages_35; stdenv.mkDerivation rec { name = "include-what-you-use-${version}"; @@ -16,12 +14,9 @@ stdenv.mkDerivation rec { longDescription = '' For every symbol (type, function variable, or macro) that you use in foo.cc, either foo.cc or foo.h should #include a .h file that exports the - declaration of that symbol. The include-what-you-use tool is a program - that can be built with the clang libraries in order to analyze #includes - of source files to find include-what-you-use violations, and suggest - fixes for them. The main goal of include-what-you-use is to remove - superfluous #includes. It does this both by figuring out what #includes - are not actually needed for this file (for both .cc and .h files), and + declaration of that symbol. The main goal of include-what-you-use is to + remove superfluous #includes, both by figuring out what #includes are not + actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; homepage = http://include-what-you-use.com; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix new file mode 100644 index 00000000000..e9ddc17bb02 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf, pkgconfig, libarchive, unzip, makeWrapper }: + +stdenv.mkDerivation rec { + name = "bazel-20150326.981b7bc1"; + + src = fetchFromGitHub { + owner = "google"; + repo = "bazel"; + rev = "981b7bc1"; + sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7"; + }; + + buildInputs = [ pkgconfig protobuf zlib zip jdk libarchive unzip makeWrapper ]; + + installPhase = '' + PROTOC=protoc bash compile.sh + mkdir -p $out/bin $out/share + cp -R output $out/share/bazel + ln -s $out/share/bazel/bazel $out/bin/bazel + wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk}" + ''; + + meta = { + homepage = http://github.com/google/bazel/; + description = "Build tool that builds code quickly and reliably"; + license = stdenv.lib.licenses.asl20; + }; +} diff --git a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch new file mode 100644 index 00000000000..25bbd2a91ba --- /dev/null +++ b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch @@ -0,0 +1,11 @@ +--- ./Modules/FindOpenSSL.cmake ++++ ./Modules/FindOpenSSL.cmake +@@ -264,7 +264,7 @@ + set(OPENSSL_VERSION "${_OPENSSL_VERSION}") + elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h") + file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str +- REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") ++ REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*") + + # The version number is encoded as 0xMNNFFPPS: major minor fix patch status + # The status gives if this is a developer or prerelease and is ignored here. diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 60a941a6637..64ed4d59d3d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -32,14 +32,18 @@ stdenv.mkDerivation rec { sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. + # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; url = "http://public.kitware.com/Bug/file_download.php?" + "file_id=4981&type=bug"; sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; - }); + }) ++ + # fix cmake detection of openssl libs + # see: http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=15386 + # and http://www.cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5d9a8283cfac15b4a5a07f18d5eb10c1f388505#patch1 + [./cmake_find_openssl_for_openssl-1.0.1m_and_up.patch]; buildInputs = [ curl expat zlib bzip2 libarchive ] ++ optional useNcurses ncurses @@ -48,7 +52,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs; - + configureFlags = "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + stdenv.lib.optionalString useQt4 " --qt-gui"; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 305ccdb8dd0..7c0cfa51cd7 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { passthru = { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir - links = extraConfig : (runCommand "ccache-links" { } + links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index f73f47ab87b..0b42b88ef7a 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -41,7 +41,7 @@ let # # extraConfig is meant to be sh lines exporting environment # variables like DISTCC_HOSTS, DISTCC_DIR, ... - links = extraConfig : (runCommand "distcc-links" { } + links = extraConfig: (runCommand "distcc-links" { passthru.gcc = gcc.cc; } '' mkdir -p $out/bin if [ -x "${gcc.cc}/bin/gcc" ]; then diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e6169c48a44..01d75a5bb01 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, libtool, ncurses }: +{ fetchurl, stdenv, libtool, ncurses, ctags, sqlite +, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { name = "global-6.3.4"; @@ -8,19 +9,27 @@ stdenv.mkDerivation rec { sha256 = "0hcplcayyjf42d8ygzla6142b5dq4ybq4wg3n3cgx3b5yfhvic85"; }; - buildInputs = [ libtool ncurses ]; + buildInputs = [ libtool ncurses makeWrapper ]; + propagatedBuildInputs = [ pythonPackages.pygments ]; configurePhase = '' ./configure --prefix="$out" --disable-static '' + ''--with-posix-sort=$(type -p sort) '' + ''--with-ltdl-include=${libtool}/include --with-ltdl-lib=${libtool}/lib '' - + ''--with-ncurses=${ncurses}''; + + ''--with-ncurses=${ncurses} '' + + ''--with-sqlite3=${sqlite} '' + + ''--with-exuberant-ctags=${ctags}/bin/ctags''; doCheck = true; postInstall = '' mkdir -p "$out/share/emacs/site-lisp" cp -v *.el "$out/share/emacs/site-lisp" + + wrapProgram $out/bin/gtags \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" + wrapProgram $out/bin/global \ + --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 1b4cab361ce..e4c2b474d46 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation rec { name = "sysbench-0.4.12"; - buildInputs = [ autoreconfHook mysql libxslt zlib ]; + + buildInputs = [ autoreconfHook mysql.lib libxslt zlib ]; + src = fetchurl { url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz; sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3"; }; + preAutoreconf = '' touch NEWS AUTHORS ''; diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 1f36a14fa97..28eb95fd08b 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.nongnu.org/texi2html/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 9f02b10c898..ce9941b2362 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "re2c-${version}"; - version = "0.14.1"; + version = "0.14.2"; src = fetchurl { url = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz"; - sha256 = "0xfskwzr6n94sa22m24x7z051qfbb9d6k4dipcv95s8j8zq74dcv"; + sha256 = "0c0w5w1dp9v9d0a6smjbnk6zvfs77fx1xd7damap3x3sjxiyn0m7"; }; meta = { diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix new file mode 100644 index 00000000000..5edc57e2f81 --- /dev/null +++ b/pkgs/development/tools/toluapp/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, scons, lua }: + +stdenv.mkDerivation rec { + version = "1.0.92"; + name = "toluapp-${version}"; + + src = fetchFromGitHub { + owner = "eddieringle"; + repo = "toluapp"; + rev = "b1e680dc486c17128a3c21f89db1693ff06c02b1"; + sha256 = "1d1a9bll9825dg4mz71vwykvfd3s5zi2yvzbfsvlr3qz1l3zqfwb"; + }; + + buildInputs = [ lua scons ]; + + patches = [ ./environ-and-linux-is-kinda-posix.patch ]; + + preConfigure = '' + substituteInPlace config_posix.py \ + --replace /usr/local $out + ''; + + NIX_CFLAGS_COMPILE = "-fPIC"; + + buildPhase = ''scons''; + + installPhase = ''scons install''; + + meta = { + licence = stdenv.lib.licenses.mit; + }; + +} diff --git a/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch new file mode 100644 index 00000000000..6743b25cb8a --- /dev/null +++ b/pkgs/development/tools/toluapp/environ-and-linux-is-kinda-posix.patch @@ -0,0 +1,36 @@ +As it turns out, scons doesn't inherit environment variables by +default. Debugging this was very pleasant. -- oxij + +diff --git a/SConstruct b/SConstruct +index 5c1e774..66aa4c8 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -5,13 +5,11 @@ tools = ['default'] + if os.name == 'nt': + tools = ['mingw'] + +-env = Environment(tools = tools) ++env = Environment(tools = tools, ENV = os.environ) + + options_file = None +-if sys.platform == 'linux2': +- options_file = "linux" + +-elif 'msvc' in env['TOOLS']: ++if 'msvc' in env['TOOLS']: + options_file = "msvc" + else: + options_file = "posix" +diff --git a/config_posix.py b/config_posix.py +index 2bb696c..eb4eb9b 100644 +--- a/config_posix.py ++++ b/config_posix.py +@@ -16,7 +16,7 @@ CCFLAGS = ['-O2', '-ansi', '-Wall'] + prefix = '/usr/local' + + # libraries +-LIBS = ['lua', 'lualib', 'm'] ++LIBS = ['lua', 'liblua', 'm'] + + + |