diff options
Diffstat (limited to 'pkgs/development')
1594 files changed, 8569 insertions, 2130 deletions
diff --git a/pkgs/development/compilers/agda/stdlib-2.4.0.nix b/pkgs/development/compilers/agda/stdlib-0.8.nix index faa55d379b1..913ae5cd90f 100644 --- a/pkgs/development/compilers/agda/stdlib-2.4.0.nix +++ b/pkgs/development/compilers/agda/stdlib-0.8.nix @@ -1,23 +1,22 @@ { cabal, fetchurl, filemanip, Agda }: -cabal.mkDerivation (self: { - pname = "Agda-lib-ffi"; - version = "2.4.0"; +cabal.mkDerivation (self: rec { + pname = "Agda-stdlib"; + version = "0.8"; src = fetchurl { - url = "https://github.com/agda/agda-stdlib/archive/v2.4.0.tar.gz"; - sha256 = "1rz0jrkm1b8d8aj9hbj3yl2k219c57r0cizfx98qqf1b9mwixzbf"; + url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; + sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78"; }; buildDepends = [ filemanip Agda ]; - jailbreak = true; # otherwise, it complains about base preConfigure = "cd ffi"; postInstall = '' mkdir -p $out/share cd .. - runhaskell GenerateEverything + ${self.ghc.ghc}/bin/runhaskell GenerateEverything ${Agda}/bin/agda -i . -i src Everything.agda cp -pR src $out/share/agda ''; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 5ea470bfc87..29e95863921 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -63,8 +63,13 @@ stdenv.mkDerivation { builder = ./builder.sh; meta = { + description = "Functional programming language based on Standard ML"; + longDescription = '' + Alice ML is a functional programming language based on Standard ML, + extended with rich support for concurrent, distributed, and constraint + programming. + ''; homepage = http://www.ps.uni-saarland.de/alice/; - description = "Alice ML is a functional programming language based on Standard ML, extended with rich support for concurrent, distributed, and constraint programming."; license = "BSD"; }; } diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 1a4e3377501..ff9f5d3f7c2 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "4.9.0"; + version = "4.9.0.1"; platform = with stdenv; if isDarwin then "macosx" else if isCygwin then "cygwin" @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://code.call-cc.org/releases/4.9.0/chicken-${version}.tar.gz"; - sha256 = "08jaavr3lhs0z2q9k7b7w8l3fsxpms58zxg8nyk8674p54cbwaig"; + sha256 = "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4"; }; buildFlags = "PLATFORM=${platform} PREFIX=$(out) VARDIR=$(out)/var/lib"; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 859c55662dc..0d8d8e3d6d7 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -12,13 +12,16 @@ stdenv.mkDerivation rec { buildInputs = [ coq ocaml ocamlPackages.menhir ]; enableParallelBuilding = true; - configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ ia32-linux"; + configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " + + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); meta = { description = "Formally verified C compiler"; homepage = "http://compcert.inria.fr"; license = stdenv.lib.licenses.inria; - platforms = [ "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + platforms = stdenv.lib.platforms.linux ++ + stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.thoughtpolice + stdenv.lib.maintainers.jwiegley ]; }; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index 99f0828012f..99f0828012f 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix new file mode 100644 index 00000000000..573cc826221 --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib +, xlibs, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib +} : + +stdenv.mkDerivation rec { + name = "cudatoolkit-6.0.37"; + + dontPatchELF = true; + dontStrip = true; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; + sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40"; + } + else throw "cudatoolkit does not support platform ${stdenv.system}"; + + outputs = [ "out" "sdk" ]; + + buildInputs = [ perl ]; + + runtimeDependencies = [ + ncurses expat python zlib + xlibs.libX11 xlibs.libXext xlibs.libXrender xlibs.libXt xlibs.libXtst xlibs.libXi xlibs.libXext + gtk2 glib fontconfig freetype unixODBC alsaLib + ]; + + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + + unpackPhase = '' + sh $src --keep --noexec + cd pkg/run_files + sh cuda-linux64-rel-6.0.37-18176142.run --keep --noexec + sh cuda-samples-linux-6.0.37-18176142.run --keep --noexec + cd pkg + ''; + + buildPhase = '' + find . -type f -executable -exec patchelf \ + --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + '{}' \; || true + find . -type f -exec patchelf \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --force-rpath \ + '{}' \; || true + ''; + + installPhase = '' + mkdir $out $sdk + perl ./install-linux.pl --prefix="$out" + rm $out/tools/CUDA_Occupancy_Calculator.xls + perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + ''; + + meta = { + license = [ "nonfree" ]; + }; +} + diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix index 5f389d48c8e..264c75ee7af 100644 --- a/pkgs/development/compilers/elm/elm-server.nix +++ b/pkgs/development/compilers/elm/elm-server.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, Elm, filepath, mtl, snapCore, snapServer , unorderedContainers }: diff --git a/pkgs/development/compilers/epic/default.nix b/pkgs/development/compilers/epic/default.nix index 1767a61a7d1..af638290610 100644 --- a/pkgs/development/compilers/epic/default.nix +++ b/pkgs/development/compilers/epic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boehmgc, Cabal, gmp, happy, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/compilers/gcc/4.2-apple64/default.nix b/pkgs/development/compilers/gcc/4.2-apple64/default.nix index 011086164ad..229f68fd841 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/default.nix +++ b/pkgs/development/compilers/gcc/4.2-apple64/default.nix @@ -12,7 +12,7 @@ let revision = "5666.3"; # Apple's fork revision number. in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "gcc-apple-${version}.${revision}"; builder = ./builder.sh; @@ -33,8 +33,10 @@ stdenv.mkDerivation { sourceRoot = "gcc-${revision}/"; + # The floor_log2_patch is from a Gentoo fix for the same issue: + # https://bugs.gentoo.org/attachment.cgi?id=363174&action=diff patches = - [ ./pass-cxxcpp.patch ] + [ ./pass-cxxcpp.patch ./floor_log2_patch.diff ] ++ stdenv.lib.optional noSysDirs ./no-sys-dirs.patch ++ stdenv.lib.optional langCC ./fix-libstdc++-link.patch; diff --git a/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch index e7b8a55a29a..5a417f8151b 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch +++ b/pkgs/development/compilers/gcc/4.2-apple64/fix-libstdc++-link.patch @@ -3,6 +3,9 @@ Prevent our libstdc++.dylib from having a runtime dependency on passed by g++ when it links libstdc++.dylib. Adding "-nostdlib" to the g++ invocation prevents this. +jww (2014-06-21): I've added several more patches to this, for building on +Mavericks. + diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstdcxx-39/libstdcxx/libstdc++-v3/src/Makefile.in --- x/libstdcxx/libstdc++-v3/src/Makefile.in 2006-10-16 21:08:22.000000000 +0200 +++ y/libstdcxx/libstdc++-v3/src/Makefile.in 2012-02-17 18:44:05.210570590 +0100 @@ -15,3 +18,54 @@ diff -ru -x '*~' libstdcxx-39-orig/libstdcxx/libstdc++-v3/src/Makefile.in libstd # Use special rules for the deprecated source files so that they find +--- x/libstdcxx/libstdc++-v3/libsupc++/unwind-cxx.h ++++ y/libstdcxx/libstdc++-v3/libsupc++/unwind-cxx.h +@@ -38,7 +38,7 @@ + #include <typeinfo> + #include <exception> + #include <cstddef> +-#include "unwind.h" ++#include "unwind-generic.h" + + #pragma GCC visibility push(default) + +@@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid (); + // throws, and if bad_exception needs to be thrown. Called from the + // compiler. + extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn)); +-extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn)); ++extern "C" void __cxa_call_terminate(_Unwind_Exception* ue_header); + + #ifdef __ARM_EABI_UNWINDER__ + // Arm EABI specified routines. +--- x/libstdcxx/libstdc++-v3/include/ext/bitmap_allocator.h ++++ y/libstdcxx/libstdc++-v3/include/ext/bitmap_allocator.h +@@ -549,6 +549,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + */ + class free_list + { ++ public: + typedef size_t* value_type; + typedef __detail::__mini_vector<value_type> vector_type; + typedef vector_type::iterator iterator; +--- x/libstdcxx/libstdc++-v3/include/ext/ropeimpl.h ++++ y/libstdcxx/libstdc++-v3/include/ext/ropeimpl.h +@@ -433,7 +433,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + { + size_t __old_len = __r->_M_size; + _CharT* __new_data = (_CharT*) +- _Data_allocate(_S_rounded_up_size(__old_len + __len)); ++ _Base::_Data_allocate(_S_rounded_up_size(__old_len + __len)); + _RopeLeaf* __result; + + uninitialized_copy_n(__r->_M_data, __old_len, __new_data); +@@ -817,7 +817,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + if (__result_len > __lazy_threshold) + goto lazy; + __section = (_CharT*) +- _Data_allocate(_S_rounded_up_size(__result_len)); ++ _Base::_Data_allocate(_S_rounded_up_size(__result_len)); + try + { (*(__f->_M_fn))(__start, __result_len, __section); } + catch(...) + diff --git a/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff b/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff new file mode 100644 index 00000000000..f37e6c4990e --- /dev/null +++ b/pkgs/development/compilers/gcc/4.2-apple64/floor_log2_patch.diff @@ -0,0 +1,62 @@ +--- gcc-5666.3/gcc/toplev.h ++++ gcc-5666.3/gcc/toplev.h +@@ -151,6 +151,8 @@ + /* Return true iff flags are set as if -ffast-math. */ + extern bool fast_math_flags_set_p (void); + ++#if GCC_VERSION < 3004 ++ + /* Return log2, or -1 if not exact. */ + extern int exact_log2 (unsigned HOST_WIDE_INT); + +@@ -158,7 +160,7 @@ + extern int floor_log2 (unsigned HOST_WIDE_INT); + + /* Inline versions of the above for speed. */ +-#if GCC_VERSION >= 3004 ++#else /* GCC_VERSION < 3004 */ + # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG + # define CLZ_HWI __builtin_clzl + # define CTZ_HWI __builtin_ctzl +@@ -172,18 +172,18 @@ + # define CTZ_HWI __builtin_ctz + # endif + +-extern inline int ++static inline int + floor_log2 (unsigned HOST_WIDE_INT x) + { + return x ? HOST_BITS_PER_WIDE_INT - 1 - (int) CLZ_HWI (x) : -1; + } + +-extern inline int ++static inline int + exact_log2 (unsigned HOST_WIDE_INT x) + { + return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1; + } +-#endif /* GCC_VERSION >= 3004 */ ++#endif /* GCC_VERSION < 3004 */ + + /* Functions used to get and set GCC's notion of in what directory + compilation was started. */ +--- gcc-5666.3/gcc/toplev.c ++++ gcc-5666.3/gcc/toplev.c +@@ -555,7 +555,7 @@ + for floor_log2 and exact_log2; see toplev.h. That construct, however, + conflicts with the ISO C++ One Definition Rule. */ + +-#if GCC_VERSION < 3004 || !defined (__cplusplus) ++#if GCC_VERSION < 3004 + + /* Given X, an unsigned number, return the largest int Y such that 2**Y <= X. + If X is 0, return -1. */ +@@ -607,7 +607,7 @@ + #endif + } + +-#endif /* GCC_VERSION < 3004 || !defined (__cplusplus) */ ++#endif /* GCC_VERSION < 3004 */ + + /* Handler for fatal signals, such as SIGSEGV. These are transformed + into ICE messages, which is much more user friendly. In case the diff --git a/pkgs/development/compilers/gcc/4.2/builder.sh b/pkgs/development/compilers/gcc/4.2/builder.sh deleted file mode 100644 index d749fc08d2a..00000000000 --- a/pkgs/development/compilers/gcc/4.2/builder.sh +++ /dev/null @@ -1,96 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad -# Thing. -export CPP="gcc -E" - - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_GCC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include - - else - # Hack: support impure environments. - extraCFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraCFlags="-g0 $extraCFlags" - extraLDFlags="--strip-debug $extraLDFlags" - - export NIX_EXTRA_CFLAGS=$extraCFlags - for i in $extraLDFlags; do - export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - LIMITS_H_TEST=true \ - X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ - ) -fi - - -preConfigure() { - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postInstall() { - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # Get rid of some "fixed" header files - rm -rf $out/lib/gcc/*/*/include/root - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done -} - - -if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" -else - buildFlags="profiledbootstrap $buildFlags" -fi - -genericBuild diff --git a/pkgs/development/compilers/gcc/4.2/default.nix b/pkgs/development/compilers/gcc/4.2/default.nix deleted file mode 100644 index 69cac159d4a..00000000000 --- a/pkgs/development/compilers/gcc/4.2/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, profiledCompiler ? false -, staticCompiler ? false -, gmp ? null -, mpfr ? null -, texinfo ? null -, name ? "gcc" -}: - -with stdenv.lib; - -let version = "4.2.4"; in - -stdenv.mkDerivation { - name = "${name}-${version}"; - - builder = ./builder.sh; - - src = - optional /*langC*/ true (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "0cm5yzhqhgdfk03aayakmdj793sya42xkkqhslj7s2b697hygjfg"; - }) ++ - optional langCC (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "0gq8ikci0qqgck71qqlhfld6zkwn9179x6z15vdd9blkdig55nxg"; - }) ++ - optional langFortran (fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "013yqiqhdavgxzjryvylgf3lcnknmw89fx41jf2v4899srn0bhkg"; - }); - - patches = - [./pass-cxxcpp.patch ./siginfo_t.patch] - ++ optional noSysDirs [./no-sys-dirs.patch]; - - inherit noSysDirs profiledCompiler staticCompiler; - - buildInputs = [gmp mpfr texinfo]; - - configureFlags = " - --disable-multilib - --disable-libstdcxx-pch - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ) - ) - } - ${if stdenv.isi686 then "--with-arch=i686" else ""} - "; - - NIX_EXTRA_LDFLAGS = if staticCompiler then "-static" else ""; - - passthru = { inherit langC langCC langFortran; }; - - meta = { - homepage = "http://gcc.gnu.org/"; - license = "GPL/LGPL"; - description = "GNU Compiler Collection, 4.2.x"; - }; -} diff --git a/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch deleted file mode 100644 index f1d429e274a..00000000000 --- a/pkgs/development/compilers/gcc/4.2/no-sys-dirs.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -rc gcc-4.2.0-orig/Makefile.in gcc-4.2.0/Makefile.in -*** gcc-4.2.0-orig/Makefile.in 2006-12-29 18:47:06.000000000 +0100 ---- gcc-4.2.0/Makefile.in 2007-05-20 21:06:42.000000000 +0200 -*************** -*** 364,369 **** ---- 364,377 ---- - @host_makefile_frag@ - ### - -+ CFLAGS += $(NIX_EXTRA_CFLAGS) -+ CPPFLAGS_FOR_TARGET += $(NIX_EXTRA_CFLAGS) -+ CXXFLAGS += $(NIX_EXTRA_CFLAGS) -+ LDFLAGS += $(NIX_EXTRA_LDFLAGS) -+ LDFLAGS_FOR_TARGET += $(NIX_EXTRA_LDFLAGS) -+ BOOT_CFLAGS += $(NIX_EXTRA_CFLAGS) -+ BOOT_LDFLAGS += $(NIX_EXTRA_LDFLAGS) -+ - # This is the list of directories that may be needed in RPATH_ENVVAR - # so that prorgams built for the target machine work. - TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(HOST_LIB_PATH_gcc) -diff -rc gcc-4.2.0-orig/gcc/Makefile.in gcc-4.2.0/gcc/Makefile.in -*** gcc-4.2.0-orig/gcc/Makefile.in 2007-03-12 05:40:09.000000000 +0100 ---- gcc-4.2.0/gcc/Makefile.in 2007-05-20 19:35:13.000000000 +0200 -*************** -*** 396,402 **** - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! NATIVE_SYSTEM_HEADER_DIR = /usr/include - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - ---- 396,406 ---- - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. -! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -! # `fixinc' from fixing header files in /usr/include. However, -! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -! # it to some dummy directory. -! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -*************** -*** 3066,3072 **** - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -! -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ ---- 3070,3076 ---- - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -! -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ -diff -rc gcc-4.2.0-orig/gcc/cppdefault.c gcc-4.2.0/gcc/cppdefault.c -*** gcc-4.2.0-orig/gcc/cppdefault.c 2006-01-20 22:00:03.000000000 +0100 ---- gcc-4.2.0/gcc/cppdefault.c 2007-05-20 17:16:44.000000000 +0200 -*************** -*** 41,46 **** ---- 41,50 ---- - # undef CROSS_INCLUDE_DIR - #endif - -+ #undef LOCAL_INCLUDE_DIR -+ #undef SYSTEM_INCLUDE_DIR -+ #undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c -*** gcc-4.2.0-orig/gcc/gcc.c 2007-03-05 21:37:05.000000000 +0100 ---- gcc-4.2.0/gcc/gcc.c 2007-05-20 17:49:48.000000000 +0200 -*************** -*** 1449,1458 **** - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 -! #define STANDARD_STARTFILE_PREFIX_1 "/lib/" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 -! #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" - #endif - - #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ ---- 1449,1458 ---- - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 -! #define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 -! #define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ -*************** -*** 1473,1480 **** - #endif - - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -! static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/"; -! static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/"; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; ---- 1473,1480 ---- - #endif - - static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; -! static const char *const standard_exec_prefix_1 = "/no-such-path/"; -! static const char *const standard_exec_prefix_2 = "/no-such-path/"; - static const char *md_exec_prefix = MD_EXEC_PREFIX; - - static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; -diff -rc gcc-4.2.0-orig/ltconfig gcc-4.2.0/ltconfig -*** gcc-4.2.0-orig/ltconfig 2007-02-14 18:08:35.000000000 +0100 ---- gcc-4.2.0/ltconfig 2007-05-20 22:16:24.000000000 +0200 -*************** -*** 2322,2327 **** ---- 2322,2332 ---- - # A language-specific compiler. - CC=$CC - -+ # Ugly hack to get libmudflap (and possibly other libraries) to build. -+ # Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag -+ # to Glibc gets lost. Here we forcibly add it to any invocation. -+ CC="\$CC $NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" -+ - # Is the compiler the GNU C compiler? - with_gcc=$with_gcc - diff --git a/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch b/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch deleted file mode 100644 index 9b0676d4fdc..00000000000 --- a/pkgs/development/compilers/gcc/4.2/pass-cxxcpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc gcc-orig/Makefile.in gcc-4.1.1/Makefile.in -*** gcc-orig/Makefile.in Wed Jun 21 13:40:23 2006 ---- gcc-4.1.1/Makefile.in Wed Jun 21 14:19:44 2006 -*************** -*** 213,219 **** - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ ---- 213,220 ---- - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD)"; export CXX; \ -! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ diff --git a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch b/pkgs/development/compilers/gcc/4.2/siginfo_t.patch deleted file mode 100644 index bfb9f975372..00000000000 --- a/pkgs/development/compilers/gcc/4.2/siginfo_t.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bbs.archlinux.org/viewtopic.php?id=144949 ---- a/gcc/config/i386/linux-unwind.h 2011-01-03 20:52:22.000000000 +0000 -+++ b/gcc/config/i386/linux-unwind.h 2012-07-06 12:23:51.562859470 +0100 -@@ -133,9 +133,9 @@ - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index f00c42e421a..ab7732a68eb 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -52,7 +52,7 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.9.0"; +let version = "4.9.1"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "0mqjxpw2klskls00lwx1k24pnyzm3whqxg3hk74c3sddgfllgc5r"; + sha256 = "0zki3ngi0gsidnmsp88mjl2868cc7cm5wm1vwqw6znja28d7hd6k"; }; inherit patches; diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index 6706b99e203..5dd2e14b0c6 100644 --- a/pkgs/development/compilers/ghc/7.0.2.nix +++ b/pkgs/development/compilers/ghc/7.0.2.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres ]; inherit (ghc.meta) license platforms; + broken = true; }; } diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index 0b422043ae2..c8d4b264804 100644 --- a/pkgs/development/compilers/ghc/7.0.3.nix +++ b/pkgs/development/compilers/ghc/7.0.3.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { stdenv.lib.maintainers.andres ]; inherit (ghc.meta) license platforms; + broken = true; }; } diff --git a/pkgs/development/compilers/ghc/7.8.2.nix b/pkgs/development/compilers/ghc/7.8.3.nix index 8200c8c759e..dbcba36fa8f 100644 --- a/pkgs/development/compilers/ghc/7.8.2.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.8.2"; + version = "7.8.3"; name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.2/${name}-src.tar.xz"; - sha256 = "15kyz98zq22sgwkzy2bkx0yz98qkrzgdigz919vafd7fxnkf3la5"; + url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz"; + sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix new file mode 100644 index 00000000000..b9178d5e61c --- /dev/null +++ b/pkgs/development/compilers/go/1.3.nix @@ -0,0 +1,94 @@ +{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: + +let + loader386 = "${glibc}/lib/ld-linux.so.2"; + loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; + loaderArm = "${glibc}/lib/ld-linux.so.3"; +in + +stdenv.mkDerivation { + name = "go-1.3"; + + src = fetchurl { + url = https://storage.googleapis.com/golang/go1.3.src.tar.gz; + sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b"; + }; + + buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ; + + # I'm not sure what go wants from its 'src', but the go installation manual + # describes an installation keeping the src. + preUnpack = '' + mkdir -p $out/share + cd $out/share + ''; + + prePatch = '' + # Ensure that the source directory is named go + cd .. + if [ ! -d go ]; then + mv * go + fi + cd go + patchShebangs ./ # replace /bin/bash + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/areturn' src/pkg/os/os_test.go + sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go + '' + lib.optionalString stdenv.isLinux '' + sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go + sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c + sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c + sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c + ''; + + patches = [ ./cacert-1.2.patch ]; + + GOOS = if stdenv.isDarwin then "darwin" else "linux"; + GOARCH = if stdenv.isDarwin then "amd64" + else if stdenv.system == "i686-linux" then "386" + else if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "armv5tel-linux" then "arm" + else throw "Unsupported system"; + GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + + installPhase = '' + export CC=cc + + # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html + # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" + # during tests: + export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so))" + + mkdir -p "$out/bin" + export GOROOT="$(pwd)/" + export GOBIN="$out/bin" + export PATH="$GOBIN:$PATH" + cd ./src + ./all.bash + cd - + + # Copy the emacs configuration for Go files. + mkdir -p "$out/share/emacs/site-lisp" + cp ./misc/emacs/* $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = http://golang.org/; + description = "The Go Programming language"; + license = "BSD"; + maintainers = with stdenv.lib.maintainers; [ cstrahan ]; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/development/compilers/go/1_0-gcc-bug.patch b/pkgs/development/compilers/go/1_0-gcc-bug.patch new file mode 100644 index 00000000000..34cf7ab7456 --- /dev/null +++ b/pkgs/development/compilers/go/1_0-gcc-bug.patch @@ -0,0 +1,19 @@ +http://code.google.com/p/go/source/detail?r=8b13b2ec6b18 +--- a/src/cmd/cgo/gcc.go 2014-07-02 12:00:12.171796197 +0200 ++++ b/src/cmd/cgo/gcc.go 2014-07-02 12:01:57.844472754 +0200 +@@ -840,6 +840,15 @@ + func (p *Package) gccErrors(stdin []byte) string { + // TODO(rsc): require failure + args := p.gccCmd() ++ ++ // GCC 4.8.0 has a bug: it sometimes does not apply ++ // -Wunused-value to values that are macros defined in system ++ // headers. See issue 5118. Adding -Wsystem-headers avoids ++ // that problem. This will produce additional errors, but it ++ // doesn't matter because we will ignore all errors that are ++ // not marked for the cgo-test file. ++ args = append(args, "-Wsystem-headers") ++ + if *debugGcc { + fmt.Fprintf(os.Stderr, "$ %s <<EOF\n", strings.Join(args, " ")) + os.Stderr.Write(stdin) diff --git a/pkgs/development/compilers/go/1_0-opt-error.patch b/pkgs/development/compilers/go/1_0-opt-error.patch new file mode 100644 index 00000000000..d3fcd40449a --- /dev/null +++ b/pkgs/development/compilers/go/1_0-opt-error.patch @@ -0,0 +1,12 @@ +https://code.google.com/p/go-wiki/wiki/OlderVersions +--- a/src/cmd/cc/funct.c 2014-07-02 11:54:42.230663598 +0200 ++++ b/src/cmd/cc/funct.c 2014-07-02 11:55:01.653790128 +0200 +@@ -269,7 +269,7 @@ + goto bad; + + f = alloc(sizeof(*f)); +- for(o=0; o<sizeof(f->sym); o++) ++ for(o=0; o<nelem(f->sym); o++) + f->sym[o] = S; + + t->funct = f; diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 9e74643e161..b9a76a6f82b 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { sed -i '/TestHostname/areturn' src/pkg/os/os_test.go ''; - patches = [ ./cacert.patch ]; + patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ]; GOOS = "linux"; GOARCH = if stdenv.system == "i686-linux" then "386" diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix new file mode 100644 index 00000000000..705cb6e5c28 --- /dev/null +++ b/pkgs/development/compilers/go/gox.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, go, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/mitchellh/gox"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "gox"; + rev = "c7329055e2aeb253a947e5cc876586ff4ca19199"; + sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy"; + }; + } + { + root = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } + ]; + sources = stdenv.mkDerivation rec { + name = "go-deps"; + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); + }; +in + +stdenv.mkDerivation rec { + name = "gox"; + + src = sources; + + propagatedBuildInputs = [ go ]; + + installPhase = '' + ensureDir $out/bin + export GOPATH=$src + go build -v -o $out/bin/gox github.com/mitchellh/gox + ''; + + meta = with lib; { + description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build"; + homepage = https://github.com/mitchellh/gox; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 918b75156c3..1be650a544a 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.1.0"; + version = "3.2.0"; src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "71ecbd8fb5e94b2a008387a2b5e9a8df5c6f5c7b"; - sha256 = "1zv3k3bxahwyna2jgicwxm9lxs11jddpc9v41488rmzvfhdmzzkn"; + rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8"; + sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967"; fetchSubmodules = true; }; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace hphp/util/generate-buildinfo.sh \ --replace /bin/bash ${stdenv.shell} + substituteInPlace ./configure \ + --replace "/usr/bin/env bash" ${stdenv.shell} ''; installPhase = '' mkdir -p $out/bin $out/lib diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 27dcf9f03a6..df57364fa08 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -1,29 +1,32 @@ -{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint, binary -, blazeHtml, blazeMarkup, boehmgc, Cabal, cheapskate, deepseq -, filepath, gmp, happy, haskeline, languageJava, lens, libffi -, llvmGeneral, llvmGeneralPure, mtl, network, optparseApplicative -, parsers, split, text, time, transformers, trifecta -, unorderedContainers, utf8String, vector, vectorBinaryInstances -, xml, zlib +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, annotatedWlPprint, ansiTerminal, ansiWlPprint +, base64Bytestring, binary, blazeHtml, blazeMarkup, boehmgc, Cabal +, cheapskate, deepseq, filepath, fingertree, gmp, happy, haskeline +, languageJava, lens, libffi, llvmGeneral, llvmGeneralPure, mtl +, network, optparseApplicative, parsers, split, text, time +, transformers, trifecta, unorderedContainers, utf8String, vector +, vectorBinaryInstances, xml, zlib }: cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.13.1"; - sha256 = "09528c2zxriw3l8c7dd2k5db9j1qmqhs6nbqwc7dkskzqv9snz7n"; + version = "0.9.14"; + sha256 = "0kfzp89sass93p9zsxq616zfix7ipi1rmjqmcjixihi01k7c0b8b"; isLibrary = true; isExecutable = true; buildDepends = [ - annotatedWlPprint ansiTerminal ansiWlPprint binary blazeHtml - blazeMarkup Cabal cheapskate deepseq filepath haskeline - languageJava lens libffi llvmGeneral llvmGeneralPure mtl network - optparseApplicative parsers split text time transformers trifecta - unorderedContainers utf8String vector vectorBinaryInstances xml - zlib + annotatedWlPprint ansiTerminal ansiWlPprint base64Bytestring binary + blazeHtml blazeMarkup Cabal cheapskate deepseq filepath fingertree + haskeline languageJava lens libffi llvmGeneral llvmGeneralPure mtl + network optparseApplicative parsers split text time transformers + trifecta unorderedContainers utf8String vector + vectorBinaryInstances xml zlib ]; buildTools = [ happy ]; extraLibraries = [ boehmgc gmp ]; configureFlags = "-fllvm -fgmp -fffi"; + patches = [ ./trifecta-fix.patch ]; meta = { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; diff --git a/pkgs/development/compilers/idris/trifecta-fix.patch b/pkgs/development/compilers/idris/trifecta-fix.patch new file mode 100644 index 00000000000..a20e482d2c4 --- /dev/null +++ b/pkgs/development/compilers/idris/trifecta-fix.patch @@ -0,0 +1,15 @@ +diff --git a/src/Idris/AbsSyntaxTree.hs b/src/Idris/AbsSyntaxTree.hs +index 76df969..076f1ff 100644 +--- a/src/Idris/AbsSyntaxTree.hs ++++ b/src/Idris/AbsSyntaxTree.hs +@@ -194,6 +194,10 @@ data IState = IState { + idris_callswho :: Maybe (M.Map Name [Name]) + } + ++-- Required for parsers library, and therefore trifecta ++instance Show IState where ++ show = const "{internal state}" ++ + data SizeChange = Smaller | Same | Bigger | Unknown + deriving (Show, Eq) + {-! diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix index 427a690234c..fce5c0c89f3 100644 --- a/pkgs/development/compilers/idris/wrapper.nix +++ b/pkgs/development/compilers/idris/wrapper.nix @@ -1,10 +1,10 @@ -{ gmp, makeWrapper, gcc, runCommand, idris_plain}: +{ gmp, makeWrapper, gcc, runCommand, idris_plain, boehmgc}: runCommand "idris-wrapper" {} '' source ${makeWrapper}/nix-support/setup-hook mkdir -p $out/bin ln -s ${idris_plain}/bin/idris $out/bin wrapProgram $out/bin/idris \ - --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib"' \ + --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \ --suffix PATH : ${gcc}/bin '' diff --git a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch b/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch deleted file mode 100644 index 5e7370718ab..00000000000 --- a/pkgs/development/compilers/llvm/3.1/clang-include-paths.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:13:01.044083509 -0400 -@@ -2146,9 +2146,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2264,6 +2261,7 @@ - return; - - // Check if libc++ has been enabled and provide its include paths if so. -+ // !!! Will need to modify this if/when nixpkgs uses libc++ - if (GetCXXStdlibType(DriverArgs) == ToolChain::CST_Libcxx) { - // libc++ is always installed at a fixed path on Linux currently. - addSystemInclude(DriverArgs, CC1Args, diff --git a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch b/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch deleted file mode 100644 index ffa67b464ec..00000000000 --- a/pkgs/development/compilers/llvm/3.1/clang-ld-flags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur clang-3.1.src-orig/lib/Driver/ToolChains.cpp clang-3.1.src/lib/Driver/ToolChains.cpp ---- clang-3.1.src-orig/lib/Driver/ToolChains.cpp 2012-05-11 20:16:02.000000000 -0400 -+++ clang-3.1.src/lib/Driver/ToolChains.cpp 2012-10-08 01:22:53.458850737 -0400 -@@ -2077,16 +2077,6 @@ - addPathIfExists(LibPath + "/../" + Multilib, Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2100,8 +2090,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -diff -Naur clang-3.1.src-orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src-orig/lib/Driver/Tools.cpp 2012-04-18 17:32:25.000000000 -0400 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-10-08 01:25:23.913501995 -0400 -@@ -5210,24 +5210,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) -- CmdArgs.push_back("/lib64/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/pkgs/development/compilers/llvm/3.1/clang.nix b/pkgs/development/compilers/llvm/3.1/clang.nix deleted file mode 100644 index c152d2215d8..00000000000 --- a/pkgs/development/compilers/llvm/3.1/clang.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake }: - -let - version = "3.1"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake ]; - - patches = stdenv.lib.optionals (stdenv.gcc.libc != null) - [ ./clang-include-paths.patch ./clang-ld-flags.patch ]; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "11m7sm9f8qcrayckfg3z91zb3fimilpm0f7azn7q7qnkvhay4qzz"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.1/default.nix b/pkgs/development/compilers/llvm/3.1/default.nix deleted file mode 100644 index 60837d58b29..00000000000 --- a/pkgs/development/compilers/llvm/3.1/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, binutils }: - -let version = "3.1"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab"; - }; - - buildInputs = [ perl groff cmake python ]; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ]; - - enableParallelBuilding = true; - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} - diff --git a/pkgs/development/compilers/llvm/3.2/clang-purity.patch b/pkgs/development/compilers/llvm/3.2/clang-purity.patch deleted file mode 100644 index 18c70b56c54..00000000000 --- a/pkgs/development/compilers/llvm/3.2/clang-purity.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff -Naur clang-3.2.src-orig/lib/Driver/ToolChains.cpp clang-3.2.src/lib/Driver/ToolChains.cpp ---- clang-3.2.src-orig/lib/Driver/ToolChains.cpp 2012-12-16 10:59:27.000000000 -0500 -+++ clang-3.2.src/lib/Driver/ToolChains.cpp 2013-01-22 14:16:55.787547681 -0500 -@@ -2153,16 +2153,6 @@ - addPathIfExists(LibPath + "/../" + GCCTriple.str() + "/lib", Paths); - } - } -- addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths); -- addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths); -- addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths); -- -- // Try walking via the GCC triple path in case of multiarch GCC -- // installations with strange symlinks. -- if (GCCInstallation.isValid()) -- addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() + -- "/../../" + Multilib, Paths); - - // Add the non-multilib suffixed paths (if potentially different). - if (GCCInstallation.isValid()) { -@@ -2176,8 +2166,6 @@ - addPathIfExists(LibPath, Paths); - } - } -- addPathIfExists(SysRoot + "/lib", Paths); -- addPathIfExists(SysRoot + "/usr/lib", Paths); - } - - bool Linux::HasNativeLLVMSupport() const { -@@ -2228,9 +2216,6 @@ - if (DriverArgs.hasArg(options::OPT_nostdinc)) - return; - -- if (!DriverArgs.hasArg(options::OPT_nostdlibinc)) -- addSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/local/include"); -- - if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { - llvm::sys::Path P(D.ResourceDir); - P.appendComponent("include"); -@@ -2295,24 +2280,6 @@ - "/usr/include/powerpc64-linux-gnu" - }; - ArrayRef<StringRef> MultiarchIncludeDirs; -- if (getTriple().getArch() == llvm::Triple::x86_64) { -- MultiarchIncludeDirs = X86_64MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::x86) { -- MultiarchIncludeDirs = X86MultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::arm) { -- if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs; -- else -- MultiarchIncludeDirs = ARMMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mips) { -- MultiarchIncludeDirs = MIPSMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::mipsel) { -- MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc) { -- MultiarchIncludeDirs = PPCMultiarchIncludeDirs; -- } else if (getTriple().getArch() == llvm::Triple::ppc64) { -- MultiarchIncludeDirs = PPC64MultiarchIncludeDirs; -- } - for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(), - E = MultiarchIncludeDirs.end(); - I != E; ++I) { -@@ -2324,13 +2291,6 @@ - - if (getTriple().getOS() == llvm::Triple::RTEMS) - return; -- -- // Add an include of '/include' directly. This isn't provided by default by -- // system GCCs, but is often used with cross-compiling GCCs, and harmless to -- // add even when Clang is acting as-if it were a system compiler. -- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/include"); -- -- addExternCSystemInclude(DriverArgs, CC1Args, D.SysRoot + "/usr/include"); - } - - /// \brief Helper to add the thre variant paths for a libstdc++ installation. -diff -Naur clang-3.2.src-orig/lib/Driver/Tools.cpp clang-3.2.src/lib/Driver/Tools.cpp ---- clang-3.2.src-orig/lib/Driver/Tools.cpp 2012-11-21 02:56:23.000000000 -0500 -+++ clang-3.2.src/lib/Driver/Tools.cpp 2013-01-22 14:24:37.167212186 -0500 -@@ -5972,34 +5972,6 @@ - ToolChain.getArch() == llvm::Triple::thumb || - (!Args.hasArg(options::OPT_static) && - !Args.hasArg(options::OPT_shared))) { -- CmdArgs.push_back("-dynamic-linker"); -- if (isAndroid) -- CmdArgs.push_back("/system/bin/linker"); -- else if (ToolChain.getArch() == llvm::Triple::x86) -- CmdArgs.push_back("/lib/ld-linux.so.2"); -- else if (ToolChain.getArch() == llvm::Triple::arm || -- ToolChain.getArch() == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -- CmdArgs.push_back("/lib/ld-linux-armhf.so.3"); -- else -- CmdArgs.push_back("/lib/ld-linux.so.3"); -- } -- else if (ToolChain.getArch() == llvm::Triple::mips || -- ToolChain.getArch() == llvm::Triple::mipsel) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::mips64 || -- ToolChain.getArch() == llvm::Triple::mips64el) { -- if (hasMipsN32ABIArg(Args)) -- CmdArgs.push_back("/lib32/ld.so.1"); -- else -- CmdArgs.push_back("/lib64/ld.so.1"); -- } -- else if (ToolChain.getArch() == llvm::Triple::ppc) -- CmdArgs.push_back("/lib/ld.so.1"); -- else if (ToolChain.getArch() == llvm::Triple::ppc64) -- CmdArgs.push_back("/lib64/ld64.so.1"); -- else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); -diff -Naur clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp ---- clang-3.2.src-orig/lib/Frontend/InitHeaderSearch.cpp 2012-10-24 12:19:39.000000000 -0400 -+++ clang-3.2.src/lib/Frontend/InitHeaderSearch.cpp 2013-01-22 14:20:32.803925775 -0500 -@@ -221,8 +221,6 @@ - case llvm::Triple::Bitrig: - break; - default: -- // FIXME: temporary hack: hard-coded paths. -- AddPath("/usr/local/include", System, true, false, false); - break; - } - } -@@ -330,8 +328,6 @@ - break; - } - -- if ( os != llvm::Triple::RTEMS ) -- AddPath("/usr/include", System, false, false, false); - } - - void InitHeaderSearch:: diff --git a/pkgs/development/compilers/llvm/3.2/clang.nix b/pkgs/development/compilers/llvm/3.2/clang.nix deleted file mode 100644 index b8e9f946773..00000000000 --- a/pkgs/development/compilers/llvm/3.2/clang.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2 }: - -let - version = "3.2"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; -in - -stdenv.mkDerivation { - name = "clang-${version}"; - - buildInputs = [ perl llvm groff cmake libxml2 ]; - - patches = stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; - - cmakeFlags = [ - "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD=all" - "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" - ]; - - enableParallelBuilding = true; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/clang-${version}.src.tar.gz"; - sha256 = "0n2nzw3pw2v7fk67f2k2qyzd9wibvi3i5j7cjzz1csqgghzz1aia"; - }; - - passthru = { gcc = stdenv.gcc.gcc; }; - - meta = { - homepage = http://clang.llvm.org/; - description = "A C language family frontend for LLVM"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.2/default.nix b/pkgs/development/compilers/llvm/3.2/default.nix deleted file mode 100644 index c373f1c1a4a..00000000000 --- a/pkgs/development/compilers/llvm/3.2/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils }: - -let version = "3.2"; in - -stdenv.mkDerivation { - name = "llvm-${version}"; - - src = fetchurl { - url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz"; - sha256 = "0hv30v5l4fkgyijs56sr1pbrlzgd674pg143x7az2h37sb290l0j"; - }; - - patches = [ ./set_soname.patch ]; # http://llvm.org/bugs/show_bug.cgi?id=12334 - patchFlags = "-p0"; - - preConfigure = "patchShebangs ."; - - propagatedBuildInputs = [ libffi ]; - buildInputs = [ perl groff cmake python ]; # ToDo: polly, libc++; enable cxx11? - - # created binaries need to be run before installation... I coudn't find a better way - preBuild = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/lib''; - - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DBUILD_SHARED_LIBS=ON" - "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - ]; - - enableParallelBuilding = true; - #doCheck = true; # tests are broken, don't know why - - meta = { - homepage = http://llvm.org/; - description = "Collection of modular and reusable compiler and toolchain technologies"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric raskin vlstill]; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/development/compilers/llvm/3.2/set_soname.patch b/pkgs/development/compilers/llvm/3.2/set_soname.patch deleted file mode 100644 index 69ba74dddad..00000000000 --- a/pkgs/development/compilers/llvm/3.2/set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - - ifeq ($(HOST_OS),Linux) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8098b9d278f..8219882a2a2 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "nasm-2.11.01"; + name = "nasm-${version}"; + version = "2.11.05"; src = fetchurl { - url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2"; - sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7"; + url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; + sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; }; meta = { diff --git a/pkgs/development/compilers/opencxx/default.nix b/pkgs/development/compilers/opencxx/default.nix deleted file mode 100644 index 54eda51353f..00000000000 --- a/pkgs/development/compilers/opencxx/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, libtool, gcc, patches ? []}: - -stdenv.mkDerivation { - name = "opencxx-2.8"; - src = fetchurl { - url = mirror://sourceforge/opencxx/opencxx-2.8.tar.gz; - md5 = "0f71df82751fe8aba5122d6e0541c98a"; - }; - - buildInputs = [libtool]; - NIX_GCC = gcc; - - inherit patches; -} diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 3e4835c8b53..68708726c85 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -4,7 +4,7 @@ let name = "openjdk6-b16-24_apr_2009-r1"; src = fetchurl { - url = http://hg.bikemonkey.org/archive/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; + url = http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk6_darwin/openjdk6-b16-24_apr_2009-r1.tar.bz2; sha256 = "14pbv6jjk95k7hbgiwyvjdjv8pccm7m8a130k0q7mjssf4qmpx1v"; }; @@ -24,8 +24,7 @@ let echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat <<EOF > $out/nix-support/setup-hook + cat <<EOF >> $out/nix-support/setup-hook if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi EOF ''; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index fbbae495666..6fd7ad9d65b 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups +{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype , which, jdk, nettools, xorg, file , fontconfig, cpio, cacert, perl, setJavaClassPath }: @@ -15,21 +15,26 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "40"; + update = "65"; - build = "43"; + build = "32"; # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. paxflags = if stdenv.isi686 then "msp" else "m"; + cupsSrc = fetchurl { + url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2; + md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; + }; + in stdenv.mkDerivation rec { name = "openjdk-7u${update}b${build}"; src = fetchurl { - url = http://www.java.net/download/openjdk/jdk7u40/promoted/b43/openjdk-7u40-fcs-src-b43-26_aug_2013.zip; - sha256 = "15h5nmbw6yn5596ccakqdbs0vd8hmslsfg5sfk8wmjvn31bfmy00"; + url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz"; + sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx"; }; outputs = [ "out" "jre" ]; @@ -46,10 +51,14 @@ stdenv.mkDerivation rec { postUnpack = '' sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ - openjdk/hotspot/make/linux/makefiles/sa.make + openjdk*/hotspot/make/linux/makefiles/sa.make sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk + openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk + + tar xf ${cupsSrc} + cupsDir=$(echo $(pwd)/cups-*) + makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; @@ -61,9 +70,8 @@ stdenv.mkDerivation rec { "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" "FREETYPE_HEADERS_PATH=${freetype}/include" "FREETYPE_LIB_PATH=${freetype}/lib" - "MILESTONE=release" + "MILESTONE=u${update}" "BUILD_NUMBER=b${build}" - "CUPS_HEADERS_PATH=${cups}/include" "USRBIN_PATH=" "COMPILER_PATH=" "DEVTOOLS_PATH=" @@ -71,6 +79,7 @@ stdenv.mkDerivation rec { "BOOTDIR=${jdk}" "STATIC_CXX=false" "UNLIMITED_CRYPTO=1" + "FULL_DEBUG_SYMBOLS=0" ]; configurePhase = "true"; @@ -158,7 +167,7 @@ stdenv.mkDerivation rec { homepage = http://openjdk.java.net/; license = "GPLv2"; description = "The open-source Java Development Kit"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh index 028164ac395..028164ac395 100644 --- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 7683ad81e59..90a64ecd521 100644 --- a/pkgs/development/compilers/jdk/jdk7-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -1,3 +1,13 @@ +{ productVersion +, patchVersion +, downloadUrl +, sha256_i686 +, sha256_x86_64 +, jceName +, jceDownloadUrl +, sha256JCE +}: + { swingSupport ? true , stdenv , requireFile @@ -20,6 +30,7 @@ , alsaLib , atk , gdk_pixbuf +, setJavaClassPath }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -41,33 +52,30 @@ let jce = if installjce then requireFile { - name = "UnlimitedJCEPolicyJDK7.zip"; - url = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; - sha256 = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; + name = jceName; + url = jceDownloadUrl; + sha256 = sha256JCE; } else ""; in -stdenv.mkDerivation rec { - patchversion = "55"; - +let result = stdenv.mkDerivation rec { name = - if installjdk then "jdk-1.7.0_${patchversion}" else "jre-1.7.0_${patchversion}"; + if installjdk then "oraclejdk-${productVersion}u${patchVersion}" else "oraclejre-${productVersion}u${patchVersion}"; src = if stdenv.system == "i686-linux" then requireFile { - name = "jdk-7u${patchversion}-linux-i586.tar.gz"; - url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256 = "0y0v5ilbkdmf14jrvwa23x91rfdw90jji4y7hq0l494iy4wjnyc1"; + name = "jdk-${productVersion}u${patchVersion}-linux-i586.tar.gz"; + url = downloadUrl; + sha256 = sha256_i686; } else if stdenv.system == "x86_64-linux" then - requireFile { - name = "jdk-7u${patchversion}-linux-x64.tar.gz"; - url = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256 = "15sncxhjasv5i6p7hfrr92xq5ph9g6g12i4m52vp45l031bw5y46"; + name = "jdk-${productVersion}u${patchVersion}-linux-x64.tar.gz"; + url = downloadUrl; + sha256 = sha256_x86_64; } else abort "jdk requires i686-linux or x86_64 linux"; @@ -75,6 +83,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ file ] ++ stdenv.lib.optional installjce unzip; + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + installPhase = '' cd .. @@ -111,7 +122,7 @@ stdenv.mkDerivation rec { # construct the rpath rpath= for i in $libraries; do - rpath=$rpath''${rpath:+:}$i/lib''${rpath:+:}$i/lib64 + rpath=$rpath''${rpath:+:}$i/lib:$i/lib64 done if test -z "$installjdk"; then @@ -137,12 +148,6 @@ stdenv.mkDerivation rec { find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - # HACK: For some reason, appending atk to the global patchelf rpath paths causes: - # java: relocation error: java: symbol , version GLIBC_2.2.5 not defined in file libc.so.6 with link time reference - # Because only libglass.so needs atk, we put it only in it's rpath. - # This seems to work fine. - test -f $out/jre/lib/${architecture}/libglass.so && patchelf --set-rpath "$rpath:${atk}/lib" $out/jre/lib/${architecture}/libglass.so - if test -z "$pluginSupport"; then rm -f $out/bin/javaws if test -n "$installjdk"; then @@ -152,6 +157,14 @@ stdenv.mkDerivation rec { mkdir $jrePath/lib/${architecture}/plugins ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins + + mkdir -p $out/nix-support + echo -n "${setJavaClassPath}" > $out/nix-support/propagated-native-build-inputs + + # Set JAVA_HOME automatically. + cat <<EOF >> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF ''; inherit installjdk pluginSupport; @@ -160,11 +173,13 @@ stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++ + [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; + passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package + meta.license = "unfree"; -} +}; in result diff --git a/pkgs/development/compilers/jdk/jdk6-construct.sh b/pkgs/development/compilers/oraclejdk/jdk6-construct.sh index 16ee0f5a2f0..16ee0f5a2f0 100644 --- a/pkgs/development/compilers/jdk/jdk6-construct.sh +++ b/pkgs/development/compilers/oraclejdk/jdk6-construct.sh diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 97ec6b56305..97ec6b56305 100644 --- a/pkgs/development/compilers/jdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix new file mode 100644 index 00000000000..55e8ad45085 --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix @@ -0,0 +1,10 @@ +import ./jdk-linux-base.nix { + productVersion = "7"; + patchVersion = "65"; + downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; + sha256_i686 = "e3032c561deb237c033b485a358cc429ec83b621303bc6b31768855778a9eaa0"; + sha256_x86_64 = "33fac9630ca8c2d374247abc5c010ac8d2875a3384968aa3e74448361808e4b7"; + jceName = "UnlimitedJCEPolicyJDK7.zip"; + jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; + sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; +} diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix new file mode 100644 index 00000000000..63af4564374 --- /dev/null +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -0,0 +1,10 @@ +import ./jdk-linux-base.nix { + productVersion = "8"; + patchVersion = "11"; + downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html; + sha256_i686 = "3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1"; + sha256_x86_64 = "f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9"; + jceName = "jce_policy-8.zip"; + jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html; + sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59"; +} diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 08dea1f0f7f..2c27cf778a1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -16,28 +16,25 @@ with if stdenv.system == "i686-linux" then { platform = "linux-i386"; - snapshot = "3bef5684fd0582fbd4ddebd4514182d4f72924f7"; - snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy"; + snapshot = "84339ea0f796ae468ef86797ef4587274bec19ea"; target = "i686-unknown-linux-gnu"; } else if stdenv.system == "x86_64-linux" then { platform = "linux-x86_64"; - snapshot = "a7b2af1076d48e4a687a71a21478293e834349bd"; - snapshot_sha = "1c72d65pcgm3z4sly7al09mjvpp8asxbbv7iyzzv5k8f66ny2agy"; + snapshot = "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae"; target = "x86_64-unknown-linux-gnu"; } else if stdenv.system == "x86_64-darwin" then { platform = "macos-x86_64"; - snapshot = "22b884a3876cb3e40ad942ad68a496b5f239fca5"; - snapshot_sha = "0qabkvyryiwlqhzy1kscff27rx788bv7lh7d8m1hnsv38wqhwqqb"; + snapshot = "4a8c2e1b7634d73406bac32a1a97893ec3ed818d"; } else {}; -let snapshotDate = "2014-03-28"; - snapshotRev = "b8601a3"; +let snapshotDate = "2014-06-21"; + snapshotRev = "db9af1d"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { - name = "rust-0.10"; + name = "rust-0.11.0"; src = fetchurl { - url = http://static.rust-lang.org/dist/rust-0.10.tar.gz; - sha256 = "c72cfbbf03016804a81d7b68e8258ffaf018f8f5a25550ad64571ce6c2642cf9"; + url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; + sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -45,15 +42,16 @@ stdenv.mkDerivation { name = "rust-stage0"; src = fetchurl { url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}"; - sha256 = snapshot_sha; + sha1 = snapshot; }; + dontStrip = true; installPhase = '' mkdir -p "$out" cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' - patchelf --interpreter ${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker} \ - --set-rpath ${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/ \ - $out/bin/rustc + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ + --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + "$out/bin/rustc" '' else ""); }; @@ -63,8 +61,8 @@ stdenv.mkDerivation { patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; postPatch = '' substituteInPlace src/librustc/back/link.rs \ - --subst-var-by "gccPath" ${stdenv.gcc}/bin/cc \ - --subst-var-by "binutilsPath" ${stdenv.gcc.binutils}/bin/ar + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" ''; buildInputs = [ which file perl curl python27 makeWrapper ]; diff --git a/pkgs/development/compilers/rust/hardcode_paths.patch b/pkgs/development/compilers/rust/hardcode_paths.patch index b3e26281644..77e4c3f3788 100644 --- a/pkgs/development/compilers/rust/hardcode_paths.patch +++ b/pkgs/development/compilers/rust/hardcode_paths.patch @@ -1,41 +1,32 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index f198a41..3a47e51 100644 +index 7a3e912..ced75fa 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs -@@ -730,7 +730,7 @@ pub fn get_cc_prog(sess: &Session) -> ~str { - _ => {}, - } - -- get_system_tool(sess, "cc") -+ ~"@gccPath@" - } +@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String { - pub fn get_ar_prog(sess: &Session) -> ~str { -@@ -739,26 +739,7 @@ pub fn get_ar_prog(sess: &Session) -> ~str { - None => {} + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => {} ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string() } - -- get_system_tool(sess, "ar") --} - --fn get_system_tool(sess: &Session, tool: &str) -> ~str { +- // In the future, FreeBSD will use clang as default compiler. +- // It would be flexible to use cc (system's default C compiler) +- // instead of hard-coded gcc. +- // For win32, there is no cc command, so we add a condition to make it use gcc. - match sess.targ_cfg.os { -- abi::OsAndroid => match sess.opts.cg.android_cross_path { -- Some(ref path) => { -- let tool_str = match tool { -- "cc" => "gcc", -- _ => tool -- }; -- format!("{}/bin/arm-linux-androideabi-{}", *path, tool_str) -- } -- None => { -- sess.fatal(format!("need Android NDK path for the '{}' tool \ -- (-C android-cross-path)", tool)) -- } -- }, -- _ => tool.to_owned(), -- } -+ ~"@binutilsPath@" +- abi::OsWin32 => "gcc", +- _ => "cc", +- }.to_string() + } + + pub fn get_ar_prog(sess: &Session) -> String { + match sess.opts.cg.ar { + Some(ref ar) => (*ar).clone(), +- None => "ar".to_string() ++ None => "@arPath@".to_string() + } } - fn remove(sess: &Session, path: &Path) { diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix new file mode 100644 index 00000000000..c3335ea6d22 --- /dev/null +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "sbcl-bootstrap-${version}"; + version = "1.1.8"; + + src = if stdenv.isDarwin + then fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-darwin-binary.tar.bz2; + sha256 = "006pr88053wclvbjfjdypnbiw8wymbzdzi7a6kbkpdfn4zf5943j"; + } + else fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.1.8/sbcl-1.1.8-x86-64-linux-binary.tar.bz2; + sha256 = "0lh1jglxlfwk4cm6sgwk1jnb6ikhbrkx7p5aha2nbmkd6zl96prx"; + }; + + installPhase = '' + ensureDir $out/bin + cp -p src/runtime/sbcl $out/bin + ensureDir $out/share/sbcl + cp -p output/sbcl.core $out/share/sbcl + ''; + + meta = { + description = "Lisp compiler"; + homepage = "http://www.sbcl.org"; + license = "bsd"; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e1de4c53de5..579d5ec11eb 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,36 +1,18 @@ -a : -let - fetchurl = a.fetchurl; - s= # Generated upstream information - rec { - baseName="sbcl"; - version="1.2.0"; - name="${baseName}-${version}"; - hash="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - url="mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2"; - sha256="13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; - }; - buildInputs = with a; [ - clisp makeWrapper - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl, sbclBootstrap, clisp}: - inherit buildInputs; - configureFlags = []; +stdenv.mkDerivation rec { + name = "sbcl-${version}"; + version = "1.2.0"; - /* doConfigure should be removed if not needed */ - phaseNames = ["setVars" "doFixNewer" "doFixTests" "setVersion" "doPatch" "doBuild" "doInstall" "doWrap"]; + src = fetchurl { + url = mirror://sourceforge/project/sbcl/sbcl/1.2.0/sbcl-1.2.0-source.tar.bz2; + sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; + }; - setVars = a.fullDepEntry ('' - export INSTALL_ROOT=$out - mkdir test-home - export HOME=$PWD/test-home - '') ["minInit"]; + buildInputs = [ sbclBootstrap ] ++ stdenv.lib.optional stdenv.isLinux clisp; - setVersion = a.fullDepEntry ('' - echo '"${s.version}.nixos"' > version.lisp-expr + patchPhase = '' + echo '"${version}.nixos"' > version.lisp-expr echo " (lambda (features) (flet ((enable (x) @@ -38,14 +20,11 @@ rec { (disable (x) (setf features (remove x features)))) (enable :sb-thread))) " > customize-target-features.lisp - '') ["minInit" "doUnpack"]; - /* SBCL checks whether files are up-to-date in many places.. Unfortunately, same timestamp - is not good enought - */ - doFixNewer = a.fullDepEntry('' pwd + # SBCL checks whether files are up-to-date in many places.. + # Unfortunately, same timestamp is not good enough sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp sed -i src/cold/slam.lisp -e \ @@ -56,13 +35,8 @@ rec { '/date defaulted-fasl/a)' sed -i src/code/target-load.lisp -e \ '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - '') ["minInit" "doUnpack"]; - doWrap = a.fullDepEntry ('' - wrapProgram "$out/bin/sbcl" --set "SBCL_HOME" "$out/lib/sbcl" - '') ["minInit" "addInputs"]; - - doFixTests = a.fullDepEntry ('' + # Fix the tests sed -e '/deftest pwent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest grent/inil' -i contrib/sb-posix/posix-tests.lisp sed -e '/deftest .*ent.non-existing/,+5d' -i contrib/sb-posix/posix-tests.lisp @@ -70,24 +44,31 @@ rec { sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp - '') ["minInit" "doUnpack"]; + ''; + + preBuild = '' + export INSTALL_ROOT=$out + ensureDir test-home + export HOME=$PWD/test-home + ''; - doBuild = a.fullDepEntry ('' - sh make.sh clisp - '') ["minInit" "doUnpack" "addInputs"]; + buildPhase = if stdenv.isLinux + then '' + sh make.sh clisp --prefix=$out + '' + else '' + sh make.sh --prefix=$out --xc-host='${sbclBootstrap}/bin/sbcl --core ${sbclBootstrap}/share/sbcl/sbcl.core --disable-debugger --no-userinit --no-sysinit' + ''; - doInstall = a.fullDepEntry ('' - sh install.sh - '') ["doBuild" "minInit" "addInputs"]; + installPhase = '' + INSTALL_ROOT=$out sh install.sh + ''; - inherit(s) name; - inherit(s) version; meta = { description = "Lisp compiler"; - homepage = "http://www.sbcl.org"; - license = "bsd"; - maintainers = [a.lib.maintainers.raskin]; - platforms = with a.lib.platforms; all; - inherit(s) version; + homepage = http://www.sbcl.org; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix index a7c9dbc9073..41f377dbfa3 100644 --- a/pkgs/development/compilers/scala/2.9.nix +++ b/pkgs/development/compilers/scala/2.9.nix @@ -3,11 +3,11 @@ # at runtime, need jre or jdk stdenv.mkDerivation rec { - name = "scala-2.9.2"; + name = "scala-2.9.3"; src = fetchurl { - url = "http://www.scala-lang.org/downloads/distrib/files/${name}.tgz"; - sha256 = "0s1shpzw2hyz7bwxdqq19rcrzbpq4d7b0kvdvjvhy7h05x496b46"; + url = "http://www.scala-lang.org/files/archive/${name}.tgz"; + sha256 = "faaab229f78c945063e8fd31c045bc797c731194296d7a4f49863fd87fc4e7b9"; }; installPhase = '' diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix new file mode 100644 index 00000000000..27fdf75cc25 --- /dev/null +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, cpio, rsync, makeWrapper }: + +stdenv.mkDerivation rec { + name = "smlnj-bootstrap-${version}"; + + version = "110.76"; + + src = fetchurl { + url = "http://smlnj.cs.uchicago.edu/dist/working/${version}/smlnj-x86-${version}.pkg"; + sha256 = "0n3kdlqffqw97piya7i4lddrhjml2dp1q9hfq2jrd2hbzln8vdjf"; + }; + + buildInputs = [ cpio rsync makeWrapper ]; + + unpackPhase = '' + /usr/bin/xar -xf $src + cd smlnj.pkg + ''; + + buildPhase = '' + cat Payload | gunzip -dc | cpio -i + ''; + + installPhase = '' + ensureDir $out/bin + rsync -av bin/ $out/bin/ + + ensureDir $out/lib + rsync -av lib/ $out/lib/ + ''; + + postInstall = '' + wrapProgram "$out/bin/sml" --set "SMLNJ_HOME" "$out" + ''; + + meta = { + description = "Compiler for the Standard ML '97 programming language"; + homepage = http://www.smlnj.org; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.jwiegley ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 22f92f40183..871101ba03e 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,16 +11,16 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version="2.22.1"; + version = "2.29.0"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm"; + sha256 = "1g0bi8dx832s3911rr3jymnffaz3q7cnbzl53nmi6hwsr2kpc6mx"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = sourceInfo.sha256; }; inherit (sourceInfo) name version; @@ -31,7 +31,7 @@ rec { prepareBuild = a.fullDepEntry '' cd angelscript/projects/gnuc - sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" + sed -i makefile -e "s@LOCAL [?]= .*@LOCAL = $out@" mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" export SHARED=1 export VERSION="${version}" @@ -55,11 +55,9 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.zlib; - }; - passthru = { - updateInfo = { - downloadPage = "http://www.angelcode.com/angelscript/downloads.asp"; - }; + homepage="http://www.angelcode.com/angelscript/"; + downloadPage = "http://www.angelcode.com/angelscript/downloads.html"; + inherit version; }; }) x diff --git a/pkgs/development/interpreters/angelscript/default.upstream b/pkgs/development/interpreters/angelscript/default.upstream new file mode 100644 index 00000000000..7dbe527b276 --- /dev/null +++ b/pkgs/development/interpreters/angelscript/default.upstream @@ -0,0 +1,4 @@ +url http://www.angelcode.com/angelscript/downloads.html +version_link '[.]zip$' +version '.*_([0-9.]+)[.].*' '\1' +do_overwrite () { do_overwrite_just_version ; } diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 9a57a034ad1..303ea1d7471 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline }: +{ stdenv, fetchurl, readline, makeWrapper }: let dsoPatch = fetchurl { @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { sha256 = "2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333"; }; - buildInputs = [ readline ]; + buildInputs = [ readline makeWrapper ]; patches = if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ]; - configurePhase = + configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDLAGS="" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2" LDFLAGS="" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.5.1.5.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDLAGS="-fPIC" ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC" LDFLAGS="-fPIC" ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.5.1 liblua.so.5.1.5" INSTALL_DATA='cp -d' ) ''; @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { sed <"etc/lua.pc" >"$out/lib/pkgconfig/lua.pc" -e "s|^prefix=.*|prefix=$out|" mv "doc/"*.{gif,png,css,html} "$out/share/doc/lua/" rmdir $out/{share,lib}/lua/5.1 $out/{share,lib}/lua + wrapProgram $out/bin/lua \ + --set LUA_PATH '"$HOME/.nix-profile/lib/lua/5.1/?.lua;$HOME/.nix-profile/share/lua/5.1/?.lua"' \ + --set LUA_CPATH '"$HOME/.nix-profile/lib/lua/5.1/?.so;$HOME/.nix-profile/share/lua/5.1/?.so"' ''; meta = { diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix index f346b1b0986..3bcc85fb434 100644 --- a/pkgs/development/interpreters/lua-5/5.2.nix +++ b/pkgs/development/interpreters/lua-5/5.2.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { configurePhase = if stdenv.isDarwin then '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=macosx CFLAGS="-DLUA_USE_LINUX -fno-common -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.${version}.dylib" INSTALL_DATA='cp -d' ) '' else '' - makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDLAGS="-fPIC" V=${majorVersion} R=${version} ) + makeFlagsArray=( INSTALL_TOP=$out INSTALL_MAN=$out/share/man/man1 PLAT=linux CFLAGS="-DLUA_USE_LINUX -O2 -fPIC${if compat then " -DLUA_COMPAT_ALL" else ""}" LDFLAGS="-fPIC" V=${majorVersion} R=${version} ) installFlagsArray=( TO_BIN="lua luac" TO_LIB="liblua.a liblua.so liblua.so.${majorVersion} liblua.so.${version}" INSTALL_DATA='cp -d' ) ''; diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix new file mode 100644 index 00000000000..a2b42cb37c5 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/expat.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, lua5, expat }: + +stdenv.mkDerivation rec { + version = "1.3.0"; + name = "lua-expat-${version}"; + isLibrary = true; + src = fetchurl { + url = "https://matthewwild.co.uk/projects/luaexpat/luaexpat-${version}.tar.gz"; + sha256 = "1hvxqngn0wf5642i5p3vcyhg3pmp102k63s9ry4jqyyqc1wkjq6h"; + }; + + buildInputs = [ lua5 expat ]; + + preBuild = '' + makeFlagsArray=( + LUA_LDIR="$out/share/lua/${lua5.luaversion}" + LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}" + EXPAT_INC="-I${expat}/include"); + ''; + + meta = { + homepage = "http://matthewwild.co.uk/projects/luaexpat"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix new file mode 100644 index 00000000000..a5da2c5ddd0 --- /dev/null +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, lua5 }: + +stdenv.mkDerivation rec { + version = "1.6.2"; + name = "lua-filesystem-${version}"; + isLibrary = true; + src = fetchurl { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_6_2.tar.gz"; + sha256 = "1n8qdwa20ypbrny99vhkmx8q04zd2jjycdb5196xdhgvqzk10abz"; + }; + + buildInputs = [ lua5 ]; + + preBuild = '' + makeFlagsArray=( + PREFIX=$out + LUA_LIBDIR="$out/lib/lua/${lua5.luaversion}" + LUA_INC="-I${lua5}/include"); + ''; + + meta = { + homepage = "https://github.com/keplerproject/luafilesystem"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix new file mode 100644 index 00000000000..97e9f51ac1b --- /dev/null +++ b/pkgs/development/interpreters/lua-5/sec.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, lua5, lua5_sockets, openssl }: + +stdenv.mkDerivation rec { + version = "0.5"; + name = "lua-sec-${version}"; + src = fetchurl { + url = "https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"; + sha256 = "08rm12cr1gjdnbv2jpk7xykby9l292qmz2v0dfdlgb4jfj7mk034"; + }; + + buildInputs = [ lua5 openssl ]; + + preBuild = '' + makeFlagsArray=( + linux + LUAPATH="$out/lib/lua/${lua5.luaversion}" + LUACPATH="$out/lib/lua/${lua5.luaversion}" + INC_PATH="-I${lua5}/include" + LIB_PATH="-L$out/lib"); + ''; + + meta = { + homepage = "https://github.com/brunoos/luasec"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch new file mode 100644 index 00000000000..231853fe51a --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch @@ -0,0 +1,11 @@ +--- a/hints/darwin.sh 2013-05-08 11:13:45.000000000 -0600 ++++ b/hints/darwin.sh 2013-05-08 11:15:04.000000000 -0600 +@@ -129,7 +129,7 @@ + + # Avoid Apple's cpp precompiler, better for extensions + if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then +- cppflags="${cppflags} -no-cpp-precomp" ++ #cppflags="${cppflags} -no-cpp-precomp" + + # This is necessary because perl's build system doesn't + # apply cppflags to cc compile lines as it should. diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix new file mode 100644 index 00000000000..d9fb32aa43e --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -0,0 +1,68 @@ +{ stdenv, fetchurl }: + +let + + libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr"; + +in + +with { + inherit (stdenv.lib) optional optionalString; +}; + +stdenv.mkDerivation rec { + name = "perl-5.20.0"; + + src = fetchurl { + url = "mirror://cpan/src/${name}.tar.gz"; + sha256 = "00ndpgw4bjing9gy2y6jvs3q46mv2ll6zrxjkhpr12fcdsnji32f"; + }; + + patches = + [ # Do not look in /usr etc. for dependencies. + ./no-sys-dirs.patch + ] + ++ optional stdenv.isSunOS ./ld-shared.patch + ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ./no-libutil.patch ] ; + + # Build a thread-safe Perl with a dynamic libperls.o. We need the + # "installstyle" option to ensure that modules are put under + # $out/lib/perl5 - this is the general default, but because $out + # contains the string "perl", Configure would select $out/lib. + # Miniperl needs -lm. perl needs -lrt. + configureFlags = + [ "-de" + "-Dcc=gcc" + "-Uinstallusrbinperl" + "-Dinstallstyle=lib/perl5" + "-Duseshrplib" + "-Dlocincpth=${libc}/include" + "-Dloclibpth=${libc}/lib" + ] + ++ optional (stdenv ? glibc) "-Dusethreads"; + + configureScript = "${stdenv.shell} ./Configure"; + + dontAddPrefix = true; + + enableParallelBuilding = true; + + preConfigure = + '' + configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" + + ${optionalString stdenv.isArm '' + configureFlagsArray=(-Dldflags="-lm -lrt") + ''} + ''; + + preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + '' + # Make Cwd work on NixOS (where we don't have a /bin/pwd). + substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" + ''; + + setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; +} diff --git a/pkgs/development/interpreters/perl/5.20/ld-shared.patch b/pkgs/development/interpreters/perl/5.20/ld-shared.patch new file mode 100644 index 00000000000..be45230c8a7 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/ld-shared.patch @@ -0,0 +1,11 @@ +--- perl-5.16.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 ++++ perl-5.16.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 +@@ -568,7 +568,7 @@ + # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" + # fi + ldflags="$ldflags -m64" +- lddlflags="$lddlflags -G -m64" ++ lddlflags="$lddlflags -shared -m64" + ;; + *) + getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.20/no-libutil.patch b/pkgs/development/interpreters/perl/5.20/no-libutil.patch new file mode 100644 index 00000000000..68d44612bfe --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/no-libutil.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure +--- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 ++++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 +@@ -1368,7 +1368,7 @@ + : List of libraries we want. + : If anyone needs extra -lxxx, put those in a hint file. + libswanted="socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun" +-libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" ++libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. + glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch new file mode 100644 index 00000000000..1793273a76f --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch @@ -0,0 +1,250 @@ +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure +--- perl-5.20.0-orig/Configure 2014-05-26 15:34:18.000000000 +0200 ++++ perl-5.20.0/Configure 2014-06-25 10:43:35.368285986 +0200 +@@ -106,15 +106,7 @@ + fi + + : Proper PATH setting +-paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' +-paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" +-paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" +-paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" +-paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" +-paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" +-paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +-paths="$paths /sbin /usr/sbin /usr/libexec" +-paths="$paths /system/gnu_library/bin" ++paths='' + + for p in $paths + do +@@ -1337,8 +1329,7 @@ + archname='' + : Possible local include directories to search. + : Set locincpth to "" in a hint file to defeat local include searches. +-locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +-locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" ++locincpth="" + : + : no include file wanted by default + inclwanted='' +@@ -1349,17 +1340,12 @@ + + libnames='' + : change the next line if compiling for Xenix/286 on Xenix/386 +-xlibpth='/usr/lib/386 /lib/386' ++xlibpth='' + : Possible local library directories to search. +-loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +-loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" ++loclibpth="" + + : general looking path for locating libraries +-glibpth="/lib /usr/lib $xlibpth" +-glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +-test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +-test -f /shlib/libc.so && glibpth="/shlib $glibpth" +-test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" ++glibpth="" + + : Private path used by Configure to find libraries. Its value + : is prepended to libpth. This variable takes care of special +@@ -1391,8 +1377,6 @@ + libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" + : We probably want to search /usr/shlib before most other libraries. + : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. +-glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` +-glibpth="/usr/shlib $glibpth" + : Do not use vfork unless overridden by a hint file. + usevfork=false + +@@ -2446,7 +2430,6 @@ + zip + " + pth=`echo $PATH | sed -e "s/$p_/ /g"` +-pth="$pth $sysroot/lib $sysroot/usr/lib" + for file in $loclist; do + eval xxx=\$$file + case "$xxx" in +@@ -4936,7 +4919,7 @@ + : Set private lib path + case "$plibpth" in + '') if ./mips; then +- plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib" ++ plibpth="$incpath/usr/lib" + fi;; + esac + case "$libpth" in +@@ -8600,13 +8583,8 @@ + echo " " + case "$sysman" in + '') +- syspath='/usr/share/man/man1 /usr/man/man1' +- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" +- syspath="$syspath /usr/man/u_man/man1" +- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" +- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" +- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" +- sysman=`./loc . /usr/man/man1 $syspath` ++ syspath='' ++ sysman='' + ;; + esac + if $test -d "$sysman"; then +@@ -19900,9 +19878,10 @@ + case "$full_ar" in + '') full_ar=$ar ;; + esac ++full_ar=ar + + : Store the full pathname to the sed program for use in the C program +-full_sed=$sed ++full_sed=sed + + : see what type gids are declared as in the kernel + echo " " +Only in perl-5.20.0/: Configure.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL +--- perl-5.20.0-orig/ext/Errno/Errno_pm.PL 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/ext/Errno/Errno_pm.PL 2014-06-25 10:31:24.317970047 +0200 +@@ -126,11 +126,7 @@ + if ($dep =~ /(\S+errno\.h)/) { + $file{$1} = 1; + } +- } elsif ($^O eq 'linux' && +- $Config{gccversion} ne '' && +- $Config{gccversion} !~ /intel/i +- # might be using, say, Intel's icc +- ) { ++ } elsif (0) { + # When cross-compiling we may store a path for gcc's "sysroot" option: + my $sysroot = $Config{sysroot} || ''; + # Some Linuxes have weird errno.hs which generate +Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh +--- perl-5.20.0-orig/hints/freebsd.sh 2014-01-31 22:55:51.000000000 +0100 ++++ perl-5.20.0/hints/freebsd.sh 2014-06-25 10:25:53.263964680 +0200 +@@ -119,21 +119,21 @@ + objformat=`/usr/bin/objformat` + if [ x$objformat = xaout ]; then + if [ -e /usr/lib/aout ]; then +- libpth="/usr/lib/aout /usr/local/lib /usr/lib" +- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" ++ libpth="" ++ glibpth="" + fi + lddlflags='-Bshareable' + else +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + fi + cccdlflags='-DPIC -fPIC' + ;; + *) +- libpth="/usr/lib /usr/local/lib" +- glibpth="/usr/lib /usr/local/lib" ++ libpth="" ++ glibpth="" + ldflags="-Wl,-E " + lddlflags="-shared " + cccdlflags='-DPIC -fPIC' +diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh +--- perl-5.20.0-orig/hints/linux.sh 2014-05-26 15:34:20.000000000 +0200 ++++ perl-5.20.0/hints/linux.sh 2014-06-25 10:33:47.354883843 +0200 +@@ -150,25 +150,6 @@ + ;; + esac + +-# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries +-# (such as -lm) in /lib or /usr/lib. So we have to ask gcc to tell us +-# where to look. We don't want gcc's own libraries, however, so we +-# filter those out. +-# This could be conditional on Unbuntu, but other distributions may +-# follow suit, and this scheme seems to work even on rather old gcc's. +-# This unconditionally uses gcc because even if the user is using another +-# compiler, we still need to find the math library and friends, and I don't +-# know how other compilers will cope with that situation. +-# Morever, if the user has their own gcc earlier in $PATH than the system gcc, +-# we don't want its libraries. So we try to prefer the system gcc +-# Still, as an escape hatch, allow Configure command line overrides to +-# plibpth to bypass this check. +-if [ -x /usr/bin/gcc ] ; then +- gcc=/usr/bin/gcc +-else +- gcc=gcc +-fi +- + case "$plibpth" in + '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries | + cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'` +@@ -178,32 +159,6 @@ + ;; + esac + +-case "$libc" in +-'') +-# If you have glibc, then report the version for ./myconfig bug reporting. +-# (Configure doesn't need to know the specific version since it just uses +-# gcc to load the library for all tests.) +-# We don't use __GLIBC__ and __GLIBC_MINOR__ because they +-# are insufficiently precise to distinguish things like +-# libc-2.0.6 and libc-2.0.7. +- for p in $plibpth +- do +- for trylib in libc.so.6 libc.so +- do +- if $test -e $p/$trylib; then +- libc=`ls -l $p/$trylib | awk '{print $NF}'` +- if $test "X$libc" != X; then +- break +- fi +- fi +- done +- if $test "X$libc" != X; then +- break +- fi +- done +- ;; +-esac +- + # Are we using ELF? Thanks to Kenneth Albanowski <kjahds@kjahds.com> + # for this test. + cat >try.c <<'EOM' +@@ -367,33 +322,6 @@ + ;; + esac + +-# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than +-# true libraries. The scripts cause binding against static +-# version of -lgdbm which is a bad idea. So if we have 'nm' +-# make sure it can read the file +-# NI-S 2003/08/07 +-case "$nm" in +- '') ;; +- *) +- for p in $plibpth +- do +- if $test -r $p/libndbm.so; then +- if $nm $p/libndbm.so >/dev/null 2>&1 ; then +- echo 'Your shared -lndbm seems to be a real library.' +- _libndbm_real=1 +- break +- fi +- fi +- done +- if $test "X$_libndbm_real" = X; then +- echo 'Your shared -lndbm is not a real library.' +- set `echo X "$libswanted "| sed -e 's/ ndbm / /'` +- shift +- libswanted="$*" +- fi +- ;; +-esac +- + # Linux on Synology. + if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then + # Tested on Synology DS213 and DS413 diff --git a/pkgs/development/interpreters/perl/5.20/setup-hook.sh b/pkgs/development/interpreters/perl/5.20/setup-hook.sh new file mode 100644 index 00000000000..6a144a7f780 --- /dev/null +++ b/pkgs/development/interpreters/perl/5.20/setup-hook.sh @@ -0,0 +1,5 @@ +addPerlLibPath () { + addToSearchPath PERL5LIB $1/lib/perl5/site_perl +} + +envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index 95120a4d9a2..86782117097 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -228,7 +228,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) '' ); src = fetchurl { - url = "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror"; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; sha256 = "04w53nn6qacpkd1x381mzd41kqh6k8kjnbyg44yvnkqwcl69db0c"; name = "php-${version}.tar.bz2"; }; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 5aabb61586e..c194c3aa8a0 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype -, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash }: +, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds }: let libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.27"; + version = "5.4.30"; name = "php-${version}"; @@ -171,6 +171,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) configureFlags = ["--enable-fpm"]; }; + mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + configureFlags = ["--with-mssql=${freetds}"]; + buildInputs = [freetds]; + }; + /* php is build within this derivation in order to add the xdebug lines to the php.ini. So both Apache and command line php both use xdebug without having to configure anything. @@ -213,6 +218,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) zipSupport = config.php.zip or true; ftpSupport = config.php.ftp or true; fpmSupport = config.php.fpm or true; + mssqlSupport = config.php.mssql or (!stdenv.isDarwin); }; configurePhase = '' @@ -236,12 +242,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ''; src = fetchurl { - urls = [ - "http://nl1.php.net/get/php-${version}.tar.bz2/from/this/mirror" - "http://se1.php.net/get/php-${version}.tar.bz2/from/this/mirror" - ]; - md5 = "1c6e99187d25023411b663ea09f145ee"; - name = "php-${version}.tar.bz2"; + url = "http://www.php.net/distributions/php-${version}.tar.bz2"; + sha256 = "1rkc977b4k0y6qg5nf8729g5zpica31h1isyds6khmrdwi23df1j"; }; meta = { diff --git a/pkgs/development/interpreters/pypy/2.2/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index d67f1c2a821..d67f1c2a821 100644 --- a/pkgs/development/interpreters/pypy/2.2/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix diff --git a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh index 35f4915569e..67c71bf0081 100644 --- a/pkgs/development/interpreters/pypy/2.2/setup-hook.sh +++ b/pkgs/development/interpreters/pypy/2.3/setup-hook.sh @@ -1,12 +1,12 @@ addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.2/site-packages + addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/pypy2.3/site-packages } toPythonPath() { local paths="$1" local result= for i in $paths; do - p="$i/lib/pypy2.2/site-packages" + p="$i/lib/pypy2.3/site-packages" result="${result}${result:+:}$p" done echo $result diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index d51838af5ad..940b667e86a 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -71,10 +71,13 @@ let ln -s $out/share/man/man1/{python2.6.1,python.1} ''; - passthru = { + passthru = rec { inherit zlibSupport; + isPy2 = true; + isPy26 = true; libPrefix = "python${majorVersion}"; - executable = "python2.6"; + executable = libPrefix; + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 523587d38c8..c19430862c2 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.7"; + version = "${majorVersion}.8"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "0y6s12rdi89k24p8zarhy9fqmyy459yg0d125c7cac4v136y70r9"; + sha256 = "0nh7d3dp75f1aj0pamn4hla8s0l7nbaq4a38brry453xrfh11ppd"; }; patches = @@ -56,6 +56,7 @@ let inherit majorVersion version src patches postPatch buildInputs; + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); @@ -84,10 +85,13 @@ let paxmark E $out/bin/python${majorVersion} ''; - passthru = { + passthru = rec { inherit zlibSupport; + isPy2 = true; + isPy27 = true; libPrefix = "python${majorVersion}"; - executable = "python2.7"; + executable = libPrefix; + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index c103b0f59cd..489d0509c1a 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" - LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" ''; - passthru = { + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; @@ -69,7 +69,10 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.2m"; - is_py3k = true; + isPy3 = true; + isPy32 = true; + is_py3k = true; # deprecated + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; @@ -88,6 +91,6 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index f9f68b9323e..fcc03380349 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" - LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -57,7 +57,7 @@ stdenv.mkDerivation { paxmark E $out/bin/python${majorVersion} ''; - passthru = { + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; @@ -66,7 +66,10 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; - is_py3k = true; + isPy3 = true; + isPy33 = true; + is_py3k = true; # deprecated + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; @@ -84,7 +87,7 @@ stdenv.mkDerivation { high level dynamic data types. ''; license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index c8d4b69b430..3477cedf4b7 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}" - LIBS="-lcrypt ${optionalString (ncurses != null) "-lncurses"}" + LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -58,7 +58,7 @@ stdenv.mkDerivation { paxmark E $out/bin/python${majorVersion} ''; - passthru = { + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; @@ -67,7 +67,10 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.4m"; - is_py3k = true; + isPy3 = true; + isPy34 = true; + is_py3k = true; # deprecated + sitePackages = "lib/${libPrefix}/site-packages"; }; enableParallelBuilding = true; @@ -85,7 +88,7 @@ stdenv.mkDerivation { high level dynamic data types. ''; license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ]; }; } diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 97808f6faf1..a8c967b5967 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, jackaudio, libsndfile, fftw, curl +, jack2, libsndfile, fftw, curl , libXt, qt, readline , useSCEL ? false, emacs }: @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - jackaudio libsndfile fftw curl libXt qt readline ] + jack2 libsndfile fftw curl libXt qt readline ] ++ optional useSCEL emacs; } diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix new file mode 100644 index 00000000000..47dea40eba2 --- /dev/null +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -0,0 +1,82 @@ +{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL +, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs +, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify +, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite +, hunspell, libevent, libstartup_notification, libvpx +, cairo, gstreamer, gst_plugins_base, icu +, debugBuild ? false +}: + +assert stdenv.gcc ? libc && stdenv.gcc.libc != null; + +let version = "31.0"; in + +stdenv.mkDerivation rec { + name = "xulrunner-${version}"; + + src = fetchurl { + url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; + sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; + }; + + buildInputs = + [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + python dbus dbus_glib pango freetype fontconfig xlibs.libXi + xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file + alsaLib nspr nss libnotify xlibs.pixman yasm mesa + xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite + xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper + hunspell libevent libstartup_notification libvpx cairo + gstreamer gst_plugins_base icu + ]; + + configureFlags = + [ "--enable-application=xulrunner" + "--disable-javaxpcom" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + "--with-system-nspr" + "--with-system-nss" + "--with-system-libevent" + "--with-system-libvpx" + # "--with-system-png" # needs APNG support + # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 + "--enable-system-ffi" + "--enable-system-hunspell" + "--enable-system-pixman" + "--enable-system-sqlite" + "--enable-system-cairo" + "--enable-gstreamer" + "--enable-startup-notification" + # "--enable-content-sandbox" # available since 26.0, but not much info available + # "--enable-content-sandbox-reporter" # keeping disabled for now + "--disable-crashreporter" + "--disable-tests" + "--disable-necko-wifi" # maybe we want to enable this at some point + "--disable-installer" + "--disable-updater" + "--disable-pulseaudio" + ] + ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" + "--enable-optimize" "--enable-strip" ]); + + enableParallelBuilding = true; + + preConfigure = + '' + mkdir ../objdir + cd ../objdir + configureScript=../mozilla-release/configure + ''; + + meta = { + description = "Mozilla Firefox XUL runner"; + homepage = http://www.mozilla.com/en-US/firefox/; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.linux; + }; + + passthru = { inherit gtk version; }; +} diff --git a/pkgs/development/libraries/accountservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 0ff5466e5c4..7b85d29c81b 100644 --- a/pkgs/development/libraries/accountservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -2,11 +2,11 @@ , libtool, gobjectIntrospection, polkit, systemd, coreutils }: stdenv.mkDerivation rec { - name = "accountsservice-0.6.35"; + name = "accountsservice-0.6.37"; src = fetchurl { - url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.35.tar.xz; - sha256 = "0f1hzl6hw56xvwgmd4yvmdyj15xj1fafw45pzv3qarww7h0wg8b5"; + url = http://www.freedesktop.org/software/accountsservice/accountsservice-0.6.37.tar.xz; + sha256 = "1hd58lrl698ij7w1xk3fpj8zp7h6m2hpzvfmbw9sfx4xvhv13cmh"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper @@ -24,4 +24,7 @@ stdenv.mkDerivation rec { --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/icons" ''; + meta = { + description = "D-Bus interface for user account query and manipulation"; + }; } diff --git a/pkgs/development/libraries/accountservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index a0c7ca23598..a0c7ca23598 100644 --- a/pkgs/development/libraries/accountservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index 7c1c5dfd7b7..ed88b89b14e 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, zlib, curl, expat, fuse, openssl }: stdenv.mkDerivation rec { - name = "afflib-3.6.12"; + version = "3.7.4"; + name = "afflib-${version}"; src = fetchurl { url = "http://digitalcorpora.org/downloads/afflib/${name}.tar.gz"; - sha256 = "1l13nrqjlvad112543qbyvrzai5by43zl96d3miklrhn26q9rs07"; + sha256 = "18j1gjb31qjcmz6lry4m2d933w2a80iagg9g5vrpw5ig80lv10f8"; }; buildInputs = [ zlib curl expat fuse openssl ]; @@ -16,5 +17,8 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.raskin ]; + inherit version; + downloadPage = "http://digitalcorpora.org/downloads/afflib/"; + updateWalker = true; }; } diff --git a/pkgs/development/libraries/allegro/5-unstable.nix b/pkgs/development/libraries/allegro/5-unstable.nix new file mode 100644 index 00000000000..a277129c0a9 --- /dev/null +++ b/pkgs/development/libraries/allegro/5-unstable.nix @@ -0,0 +1,57 @@ + +x@{builderDefsPackage + , texinfo, libXext, xextproto, libX11, xproto, libXpm, libXt, libXcursor + , alsaLib, cmake, zlib, libpng, libvorbis, libXxf86dga, libXxf86misc + , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa + , kbproto, libjpeg, flac + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="allegro"; + version = "5.1.8"; + name="${baseName}-${version}"; + project="alleg"; + url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz"; + hash="18fdppaqaf3g3rcqwhyvsmkzk3y14clz4l8cvmg4hvjgyf011f3i"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = "180mhlhgxqh3ynazf9bssnd3riw77fazjw65yr64w0av53y0h1lz"; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doCmake" "doMakeInstall"]; + + doCmake = a.fullDepEntry ('' + export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" + cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . + '') ["minInit" "doUnpack" "addInputs"]; + + makeFlags = [ + ]; + + meta = { + description = "A game programming library"; + license = "free-noncopyleft"; # giftware + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + inherit version; + }; +}) x + diff --git a/pkgs/development/libraries/allegro/5-unstable.upstream b/pkgs/development/libraries/allegro/5-unstable.upstream new file mode 100644 index 00000000000..e07829c08cc --- /dev/null +++ b/pkgs/development/libraries/allegro/5-unstable.upstream @@ -0,0 +1,7 @@ +attribute_name allegro5 +url http://alleg.sourceforge.net/download.html +version_link '/allegro-unstable/.*[.]tar[.].*/download$' +SF_redirect +do_overwrite () { + do_overwrite_just_version +} diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index 60634dc7db8..f03dd5b548c 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -6,9 +6,9 @@ x@{builderDefsPackage , kbproto, libjpeg, flac , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -38,7 +38,7 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . '') ["minInit" "doUnpack" "addInputs"]; - + makeFlags = [ ]; @@ -51,11 +51,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/alleg/files/"; - }; + inherit version; }; }) x diff --git a/pkgs/development/libraries/allegro/5.upstream b/pkgs/development/libraries/allegro/5.upstream new file mode 100644 index 00000000000..9d139383fe3 --- /dev/null +++ b/pkgs/development/libraries/allegro/5.upstream @@ -0,0 +1,7 @@ +attribute_name allegro5 +url http://alleg.sourceforge.net/download.html +version_link '[.]tar[.].*/download$' +SF_redirect +do_overwrite () { + do_overwrite_just_version +} diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 75842bee9f8..213b086c3cc 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -4,9 +4,9 @@ x@{builderDefsPackage , xf86dgaproto, xf86miscproto, xf86vidmodeproto, libXxf86vm, openal, mesa , ...}: builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; buildInputs = map (n: builtins.getAttr n x) @@ -36,11 +36,12 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lXext -lX11 -lXpm -lXcursor -lXxf86vm" cmake -D CMAKE_INSTALL_PREFIX=$out -D CMAKE_SKIP_RPATH=ON . '') ["minInit" "doUnpack" "addInputs"]; - + makeFlags = [ ]; meta = { + branch = "4"; description = "A game programming library"; license = "free-noncopyleft"; # giftware maintainers = with a.lib.maintainers; diff --git a/pkgs/development/libraries/asio/default.nix b/pkgs/development/libraries/asio/default.nix index 039c2e85d63..b5ed6f30e34 100644 --- a/pkgs/development/libraries/asio/default.nix +++ b/pkgs/development/libraries/asio/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, boost, openssl}: stdenv.mkDerivation rec { - name = "asio-1.10.1"; + name = "asio-1.10.2"; src = fetchurl { url = "mirror://sourceforge/asio/${name}.tar.bz2"; - sha256 = "16dxzkra0wmhm2vp2p9lb1h6qsdjk82sxfgj6zlz792n7jnms2l2"; + sha256 = "1lqxm3gc8rzzjq0m843l59ggbw32bih7smm5spry1j5khfc86p41"; }; propagatedBuildInputs = [ boost ]; diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index 53ff6572052..7a5351da10e 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, fftw, jackaudio, libsamplerate +{ stdenv, fetchurl, alsaLib, fftw, jack2, libsamplerate , libsndfile, pkgconfig, python }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib fftw jackaudio libsamplerate libsndfile pkgconfig python + alsaLib fftw jack2 libsamplerate libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix index f2c466009d4..62ae463b5fc 100644 --- a/pkgs/development/libraries/axis/default.nix +++ b/pkgs/development/libraries/axis/default.nix @@ -1,12 +1,16 @@ {stdenv, fetchurl}: stdenv.mkDerivation { - name = "axis-1.3"; - directory = "axis-1_3"; - builder = ./builder.sh; - src = fetchurl { - url = "http://apache.cs.uu.nl/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; - md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; - }; - inherit stdenv; + name = "axis-1.3"; + directory = "axis-1_3"; + builder = ./builder.sh; + src = fetchurl { + url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; + md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; + }; + inherit stdenv; + + meta = { + description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C"; + }; } diff --git a/pkgs/development/libraries/botan/default.upstream b/pkgs/development/libraries/botan/default.upstream index becbf348b34..8b51ede3bc9 100644 --- a/pkgs/development/libraries/botan/default.upstream +++ b/pkgs/development/libraries/botan/default.upstream @@ -1,8 +1,8 @@ url http://botan.randombit.net/download.html version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' ensure_version -ensure_hash do_overwrite(){ + ensure_hash set_var_value hash $CURRENT_HASH set_var_value baseVersion ${CURRENT_VERSION%.*} set_var_value revision ${CURRENT_VERSION##*.} diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix new file mode 100644 index 00000000000..677172dd3ac --- /dev/null +++ b/pkgs/development/libraries/botan/unstable.nix @@ -0,0 +1,58 @@ +x@{builderDefsPackage + , python + , bzip2, zlib, gmp, openssl + , boost + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="botan"; + tarBaseName="Botan"; + baseVersion = "1.11"; + revision = "9"; + version="${baseVersion}.${revision}"; + name="${baseName}-${version}"; + url="http://files.randombit.net/${baseName}/v${baseVersion}/${tarBaseName}-${version}.tbz"; + hash = "0jgx5va042gmr6nc91p5dd59wnfxlz19mz2nnyv74pvwwmizs09m"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doConfigure" "doMakeInstall" "fixPkgConfig"]; + configureCommand = "python configure.py --with-gnump --with-bzip2 --with-zlib --with-openssl"; + + fixPkgConfig = a.fullDepEntry '' + cd "$out"/lib/pkgconfig + ln -s botan-*.pc botan.pc || true + '' ["minInit" "doMakeInstall"]; + + meta = { + description = "Cryptographic algorithms library"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + unix; + inherit version; + }; + passthru = { + updateInfo = { + downloadPage = "http://files.randombit.net/botan/"; + }; + }; +}) x diff --git a/pkgs/development/libraries/botan/unstable.upstream b/pkgs/development/libraries/botan/unstable.upstream new file mode 100644 index 00000000000..9d539a2a6ea --- /dev/null +++ b/pkgs/development/libraries/botan/unstable.upstream @@ -0,0 +1,9 @@ +url http://botan.randombit.net/download.html +version_link 'Botan-[0-9]+[.][0-9]+([.][0-9]+)?[.](tbz|tbz2|tar[.]bz2)$' +ensure_version +do_overwrite(){ + ensure_hash + set_var_value hash $CURRENT_HASH + set_var_value baseVersion ${CURRENT_VERSION%.*} + set_var_value revision ${CURRENT_VERSION##*.} +} diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 9d261191fbb..74875e41783 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , unzip, cmake, mesa, freeglut, libX11, xproto - , inputproto, libXi + , inputproto, libXi, fetchsvn, pkgconfig , ...}: builderDefsPackage (a : @@ -10,21 +10,17 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="box2d"; - version="2.1.2"; - name="${baseName}-${version}"; - url="http://box2d.googlecode.com/files/Box2D_v${version}.zip"; - hash="0m5szd74ig8yqazwk2g3zl4z7wwp08k52awawk1pigy6a4z1qd9v"; - }; in rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + version = "2.3.0"; + name = "box2d-${version}"; + srcDrv = a.fetchsvn { + url = "http://box2d.googlecode.com/svn/trunk"; + rev = "277"; + sha256 = "1xp93yw2zcqhmh999v7cwqaqxq1glgyg5r8kfm4yabc1ypba3in4"; }; + src = srcDrv + "/"; - inherit (sourceInfo) name version; inherit buildInputs; phaseNames = ["changeSettings" "doCmake" "doMakeInstall"]; @@ -49,11 +45,7 @@ rec { platforms = with a.lib.platforms; linux; license = "bsd"; - }; - passthru = { - updateInfo = { - downloadPage = "http://code.google.com/p/box2d/downloads/list"; - }; + inherit version; }; }) x diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index fb3a7d92c8e..4095c1ae2f4 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,12 +1,19 @@ -{stdenv, fetchurl, python}: +{ stdenv, fetchurl, python }: stdenv.mkDerivation { name = "clearsilver-0.10.3"; + src = fetchurl { url = http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz; md5 = "ff4104b0e58bca1b61d528edbd902769"; }; + builder = ./builder.sh; inherit stdenv python; + + meta = { + description = "Fast, powerful, and language-neutral HTML template system"; + homepage = http://www.clearsilver.net/; + }; } diff --git a/pkgs/development/libraries/coredumper/default.nix b/pkgs/development/libraries/coredumper/default.nix index f62289ea181..ddd0d87a551 100644 --- a/pkgs/development/libraries/coredumper/default.nix +++ b/pkgs/development/libraries/coredumper/default.nix @@ -6,4 +6,13 @@ stdenv.mkDerivation { url = http://google-coredumper.googlecode.com/files/coredumper-1.1.tar.gz; sha256 = "1phl1zg2n17rp595dyzz9iw01gfdpsdh0l6wy2hfb5shi71h63rx"; }; + + # Doesn't build: + # + # src/elfcore.c: In function 'CreatePipeline': + # src/elfcore.c:1424:26: error: 'CLONE_VM' undeclared (first use in this function) + # CLONE_VM|CLONE_UNTRACED|SIGCHLD, &args, 0, 0, 0); + # ^ + # src/elfcore.c:1424:26: note: each undeclared identifier is reported only once for each function it appears in + meta.broken = true; } diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix index 951278b4433..ae276c6aa0a 100644 --- a/pkgs/development/libraries/dssi/default.nix +++ b/pkgs/development/libraries/dssi/default.nix @@ -1,5 +1,5 @@ x@{builderDefsPackage - , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM + , ladspaH, jack2, liblo, alsaLib, qt4, libX11, libsndfile, libSM , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig , ...}: builderDefsPackage diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix new file mode 100644 index 00000000000..a1b0d87cdfd --- /dev/null +++ b/pkgs/development/libraries/epoxy/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, autoconf, autogen, automake, gettext, libX11 +, mesa, pkgconfig, python, utilmacros +}: + +stdenv.mkDerivation rec { + name = "epoxy-${version}"; + version = "1.2"; + + src = fetchurl { + url = "https://github.com/anholt/libepoxy/archive/v${version}.tar.gz"; + sha256 = "1xp8g6b7xlbym2rj4vkbl6xpb7ijq7glpv656mc7k9b01x22ihs2"; + }; + + buildInputs = [ + autoconf autogen automake gettext libX11 mesa pkgconfig python + utilmacros + ]; + + configureScript = '' + ./autogen.sh --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "A library for handling OpenGL function pointer management"; + homepage = https://github.com/anholt/libepoxy; + license = licenses.mit; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 97043f11f50..83735376b98 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,39 +1,31 @@ -{ fetchurl, stdenv, builderDefs, precision ? "double" }: - -assert stdenv.lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; - -with { inherit (stdenv.lib) optional; }; - -let - version = "3.3.3"; - localDefs = builderDefs.passthru.function { - src = - fetchurl { - url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; - sha256 = "1wwp9b2va7vkq3ay7a9jk22nr4x5q6m37rzqy2j8y3d11c5grkc5"; - }; - buildInputs = []; - configureFlags = [ - "--enable-shared" "--disable-static" - "--enable-threads" "--enable-openmp" # very small wrappers - ] - ++ optional (precision != "double") "--enable-${precision}" - # all x86_64 have sse2 - ++ optional stdenv.isx86_64 "--enable-sse2"; - }; +{ fetchurl, stdenv, lib, precision ? "double" }: + +with lib; + +assert elem precision [ "single" "double" "long-double" "quad-precision" ]; -in with localDefs; +let version = "3.3.4"; in stdenv.mkDerivation rec { name = "fftw-${precision}-${version}"; - builder = writeScript "${name}-builder" - (textClosure localDefs [doConfigure doMakeInstall doForceShare]); + + src = fetchurl { + url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"; + sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g"; + }; + + configureFlags = + [ "--enable-shared" "--disable-static" + "--enable-threads" "--enable-openmp" # very small wrappers + ] + ++ optional (precision != "double") "--enable-${precision}" + # all x86_64 have sse2 + ++ optional stdenv.isx86_64 "--enable-sse2"; + + enableParallelBuilding = true; + meta = { description = "Fastest Fourier Transform in the West library"; - }; - passthru = { - # Allow instantiating "-A fftw.src" - inherit src; + homepage = http://www.fftw.org/; }; } - diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 0d8fa1bd281..547e9e813be 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,6 +8,13 @@ stdenv.mkDerivation { sha256 = "0r946axzxs0czsmr7283w7vmk5jx3jnxxc32d2ncxsrsh2yli0ba"; }; + doDist = true; + + distPhase = '' + touch $out/include/tds.h + touch $out/lib/libtds.a + ''; + meta = { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix new file mode 100644 index 00000000000..2e3db4c2d73 --- /dev/null +++ b/pkgs/development/libraries/frei0r/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, autoconf, cairo, opencv, pkgconfig }: + +stdenv.mkDerivation rec { + name = "frei0r-plugins-${version}"; + version = "1.4"; + + src = fetchurl { + url = "https://files.dyne.org/.xsend.php?file=frei0r/releases/${name}.tar.gz"; + sha256 = "0mxyhdp1p1a3ga8170ijygb870zwbww1dgp3kdr1nd4zvsmzqw44"; + }; + + buildInputs = [ autoconf cairo opencv pkgconfig ]; + + meta = with stdenv.lib; { + homepage = http://frei0r.dyne.org; + description = "Minimalist, cross-platform, shared video plugins"; + license = licenses.gpl2; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + + }; +} diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index b1dd66584f4..9a592d4f954 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -5,6 +5,8 @@ , libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false }: +with stdenv.lib; + # TODO: # * Add gio-module-fam # Problem: cyclic dependency on gamin @@ -38,7 +40,6 @@ let ver_maj = "2.40"; ver_min = "0"; in -with { inherit (stdenv.lib) optional optionals optionalString; }; stdenv.mkDerivation rec { name = "glib-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix new file mode 100644 index 00000000000..4e271a8c678 --- /dev/null +++ b/pkgs/development/libraries/gloox/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl +, zlibSupport ? true, zlib ? null +, sslSupport ? true, openssl ? null +, idnSupport ? true, libidn ? null +}: + +assert zlibSupport -> zlib != null; +assert sslSupport -> openssl != null; +assert idnSupport -> libidn != null; + +let + version = "1.0.10"; +in +stdenv.mkDerivation rec { + name = "gloox-${version}"; + + src = fetchurl { + url = "http://camaya.net/download/gloox-${version}.tar.bz2"; + sha256 = "300e756af97d43f3f70f1e68e4d4c7129d587dface61633f50d2c490876f58a3"; + }; + + buildInputs = [ ] + ++ stdenv.lib.optional zlibSupport zlib + ++ stdenv.lib.optional sslSupport openssl + ++ stdenv.lib.optional idnSupport libidn; + + meta = { + description = "A portable high-level Jabber/XMPP library for C++"; + homepage = "http://camaya.net/gloox"; + license = [ "GPLv3" ]; + }; +} diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index cba8d394c2b..9e28334804b 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, m4, cxx ? true }: +{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }: with { inherit (stdenv.lib) optional; }; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { name = "gmp-5.1.3"; src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { homepage = "http://gmplib.org/"; description = "GMP, the GNU multiple precision arithmetic library"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating @@ -54,7 +54,10 @@ stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = platforms.all; + maintainers = [ maintainers.simons ]; }; } + // stdenv.lib.optionalAttrs withStatic { dontDisableStatic = true; } +) + diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index 07c3c668793..a78d9890729 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -1,23 +1,15 @@ -{ stdenv -, fetchurl -}: +{ stdenv, fetchurl }: -let version = "3.0u"; in stdenv.mkDerivation { - - name = "gnu-efi-${version}"; +stdenv.mkDerivation rec { + name = "gnu-efi_${version}"; + version = "3.0u"; src = fetchurl { - url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz"; + url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz"; sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w"; }; - meta = { - description = "GNU EFI development toolchain"; - homepage = http://sourceforge.net/projects/gnu-efi/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; - platforms = ["x86_64-linux" "i686-linux"]; - }; + arch = with stdenv.lib; head (splitString "-" stdenv.system); makeFlags = [ "CC=gcc" @@ -34,8 +26,17 @@ let version = "3.0u"; in stdenv.mkDerivation { ''; installPhase = '' + mkdir -pv $out/include/efi/{protocol,$arch} make PREFIX="$out" $makeFlags install mkdir -pv $out/share/gnu-efi install -D -m644 apps/*.efi $out/share/gnu-efi ''; + + meta = with stdenv.lib; { + description = "GNU EFI development toolchain"; + homepage = http://sourceforge.net/projects/gnu-efi/; + license = licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.shlevy ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index c7c639f2adb..9ffccac1e0f 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ks9gsnhxrs2vccc6ha9m8xmj83lmw09xcws4zc0k57q4jcy5bgk"; }; - buildInputs = [ libunwind ]; + buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://code.google.com/p/gperftools/; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index eee977e9703..9631746691f 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "gsl-1.15"; + name = "gsl-1.16"; src = fetchurl { url = "mirror://gnu/gsl/${name}.tar.gz"; - sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5"; + sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k"; }; # ToDo: there might be more impurities than FMA support check @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; + homepage = http://www.gnu.org/software/gsl/; + license = "GPLv3+"; longDescription = '' The GNU Scientific Library (GSL) is a numerical library for C @@ -27,10 +29,5 @@ stdenv.mkDerivation rec { fitting. There are over 1000 functions in total with an extensive test suite. ''; - - homepage = http://www.gnu.org/software/gsl/; - license = "GPLv3+"; - - maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 1e030d4d7ce..a59e3d07cb4 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cp -v libgtest.a libgtest_main.a $out/lib cp -v -r ../include $out + cp -v -r ../src $out ''; meta = { diff --git a/pkgs/development/libraries/haskell/AC-Vector/default.nix b/pkgs/development/libraries/haskell/AC-Vector/default.nix index bbcfd4a0c92..4dd3e78652c 100644 --- a/pkgs/development/libraries/haskell/AC-Vector/default.nix +++ b/pkgs/development/libraries/haskell/AC-Vector/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/aes/default.nix b/pkgs/development/libraries/haskell/AES/default.nix index 6ffa795929f..263f2a5d582 100644 --- a/pkgs/development/libraries/haskell/aes/default.nix +++ b/pkgs/development/libraries/haskell/AES/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, monadsTf, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/BlogLiterately/default.nix b/pkgs/development/libraries/haskell/BlogLiterately/default.nix index 7d5c01f64bf..9937b1029a6 100644 --- a/pkgs/development/libraries/haskell/BlogLiterately/default.nix +++ b/pkgs/development/libraries/haskell/BlogLiterately/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, boolExtras, cmdargs, dataDefault, filepath , HaXml, haxr, highlightingKate, hscolour, lens, mtl, pandoc , pandocCiteproc, pandocTypes, parsec, split, strict, temporary diff --git a/pkgs/development/libraries/haskell/Boolean/default.nix b/pkgs/development/libraries/haskell/Boolean/default.nix index bb226733f8a..e07436c2256 100644 --- a/pkgs/development/libraries/haskell/Boolean/default.nix +++ b/pkgs/development/libraries/haskell/Boolean/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/BoundedChan/default.nix b/pkgs/development/libraries/haskell/BoundedChan/default.nix index 0ce294c2258..1f4af9d6f71 100644 --- a/pkgs/development/libraries/haskell/BoundedChan/default.nix +++ b/pkgs/development/libraries/haskell/BoundedChan/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "BoundedChan"; - version = "1.0.1.0"; - sha256 = "1v4lmp3j8lzk1m2pv5l90j80y0c6yxm6gb1ww9ffsz2jxfzz8vd8"; + version = "1.0.3.0"; + sha256 = "0vf4mlw08n056g5256cf46m5xsijng5gvjx7ccm4r132gznyl72k"; meta = { description = "Implementation of bounded channels"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/CC-delcont/default.nix b/pkgs/development/libraries/haskell/CC-delcont/default.nix index e13344034ca..459c338b80d 100644 --- a/pkgs/development/libraries/haskell/CC-delcont/default.nix +++ b/pkgs/development/libraries/haskell/CC-delcont/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix index 7b666a1cf6e..45af5f98586 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.14.0.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.14.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, filepath, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix index c1689817dcc..be54e41eb20 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.16.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, filepath, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix index 0ef09dc49b1..8df99f7c900 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.18.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck , regexPosix, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix index ee7f363318e..67faefb7a67 100644 --- a/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix +++ b/pkgs/development/libraries/haskell/Cabal/1.20.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, extensibleExceptions, filepath, HUnit, QuickCheck , regexPosix, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index 90f93edd4dc..eb0d5127c85 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, Chart, colour, dataDefaultClass, lens, mtl , operational, time }: cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.2.2"; - sha256 = "1bbi5bvrh8wmgzv5am5ndgdr68gd68ipparkkk9ld4majwf4vm6w"; + version = "1.2.3"; + sha256 = "1lbl1qvgm4yxslahlms6kzfrhh8s2fcdiwmvk1bs319k1fylia1b"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index 22e432f2f32..34cbb5511ab 100644 --- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix +++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeSvg, Chart, colour, dataDefaultClass, diagramsCore , diagramsLib, diagramsPostscript, diagramsSvg, lens, mtl , operational, SVGFonts, text, time @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Chart-diagrams"; - version = "1.2.2"; - sha256 = "144dy9vp3x04s03jrkyfqczpwayb8k7dq702w9wm3d8q4ysva62q"; + version = "1.2.3"; + sha256 = "08ps30vn9ljiyhgakwdbixn4csy504bsw3h5z9w1dxhn27wij772"; buildDepends = [ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib diagramsPostscript diagramsSvg lens mtl operational SVGFonts text diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 8b1ce6b89e7..0b281026b18 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, Chart, ChartCairo, colour, gtk, mtl, time }: cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.2.2"; - sha256 = "1mg6nln0jwp6hals9vhhsfqiwix424fv1v1p4h99s0xwy5cna1z9"; + version = "1.2.3"; + sha256 = "0vl9nh48pa7sdrqh5a6smmfallf4mwzrvspc2v94cpnrcnickiyq"; buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index 7604cd28b8e..fbadacf2e60 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, colour, dataDefaultClass, lens, mtl, operational, time }: cabal.mkDerivation (self: { pname = "Chart"; - version = "1.2.2"; - sha256 = "0yd3xca500lbzvlvhdsbrkiy53laikq6hc290rc061agvd535a7p"; + version = "1.2.3"; + sha256 = "067bahxig5xyd6zasi74k86qb7bxvbs3shjn9fbslhyckxg50q1j"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; diff --git a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix index b22272a7703..715793c7e9a 100644 --- a/pkgs/development/libraries/haskell/ChasingBottoms/default.nix +++ b/pkgs/development/libraries/haskell/ChasingBottoms/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, random, syb }: cabal.mkDerivation (self: { pname = "ChasingBottoms"; - version = "1.3.0.7"; - sha256 = "0g1bx6d2mi27qsb4bxvby50g39fm56gyi2658fyjiq1gamy50ypa"; + version = "1.3.0.8"; + sha256 = "1f6jg4j17s3y7hcz9gp7cffa77p57xgzv15ng5ypcxpq603721dv"; isLibrary = true; isExecutable = true; buildDepends = [ mtl QuickCheck random syb ]; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index b0c77eb1116..d7a33dab28e 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MissingH, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/CouchDB/default.nix b/pkgs/development/libraries/haskell/CouchDB/default.nix index ac8ab3d7728..a7035aa7033 100644 --- a/pkgs/development/libraries/haskell/CouchDB/default.nix +++ b/pkgs/development/libraries/haskell/CouchDB/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, HUnit, json, mtl, network, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Crypto/default.nix b/pkgs/development/libraries/haskell/Crypto/default.nix index c7d10d0160d..f2ee437d1af 100644 --- a/pkgs/development/libraries/haskell/Crypto/default.nix +++ b/pkgs/development/libraries/haskell/Crypto/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index ac5a6636e76..c75b82dcf15 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, either, errors, httpClient, httpClientTls , httpTypes, lens, liftedBase, monadControl, mtl, network , optparseApplicative, transformers, transformersBase, xmlConduit diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix index 81f0455bd5a..c192ad4302e 100644 --- a/pkgs/development/libraries/haskell/DRBG/default.nix +++ b/pkgs/development/libraries/haskell/DRBG/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cipherAes128, cryptoApi, cryptohashCryptoapi , entropy, mtl, parallel, prettyclass, tagged }: diff --git a/pkgs/development/libraries/haskell/Diff/default.nix b/pkgs/development/libraries/haskell/Diff/default.nix index 04149400ff8..a556dc8958d 100644 --- a/pkgs/development/libraries/haskell/Diff/default.nix +++ b/pkgs/development/libraries/haskell/Diff/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/EitherT/default.nix b/pkgs/development/libraries/haskell/EitherT/default.nix index cb2195ef6ab..4e8074409c8 100644 --- a/pkgs/development/libraries/haskell/EitherT/default.nix +++ b/pkgs/development/libraries/haskell/EitherT/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monadControl, transformers, transformersBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra/default.nix index 2634f849114..0db01edcc61 100644 --- a/pkgs/development/libraries/haskell/Extra/default.nix +++ b/pkgs/development/libraries/haskell/Extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bzlib, filepath, HUnit, mtl, network, pureMD5, QuickCheck , random, regexCompat, time, Unixutils, zlib }: diff --git a/pkgs/development/libraries/haskell/FerryCore/default.nix b/pkgs/development/libraries/haskell/FerryCore/default.nix index daef52bec75..6b1b71a22f1 100644 --- a/pkgs/development/libraries/haskell/FerryCore/default.nix +++ b/pkgs/development/libraries/haskell/FerryCore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HaXml, mtl, parsec, TableAlgebra }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLFW-b/default.nix b/pkgs/development/libraries/haskell/GLFW-b/default.nix index 5dea14a106d..f3bdfebbe67 100644 --- a/pkgs/development/libraries/haskell/GLFW-b/default.nix +++ b/pkgs/development/libraries/haskell/GLFW-b/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsGLFW, HUnit, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLFW/default.nix b/pkgs/development/libraries/haskell/GLFW/default.nix index 26a132ae028..4abea15c51d 100644 --- a/pkgs/development/libraries/haskell/GLFW/default.nix +++ b/pkgs/development/libraries/haskell/GLFW/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix index d719e8179d4..16bd7641ad7 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.3.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix index 1da2b743687..1241b88cb99 100644 --- a/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix +++ b/pkgs/development/libraries/haskell/GLURaw/1.4.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, mesa, OpenGLRaw }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix index 32e45aebeb2..1b3741fad0d 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix index 64bc7feaf17..c69c8b282a4 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix index 2b9a0fadfc9..af1eac9e43d 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.1.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix index e5ff3951d3c..c284ec40ad5 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL , StateVar, Tensor }: diff --git a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix index d65dfa15c6f..e8bd96f755a 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.3.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL , OpenGLRaw, StateVar, Tensor }: diff --git a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix index a7a7e7f371a..22ac715557a 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.4.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL , OpenGLRaw }: diff --git a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix index 79112138b4a..592de68432e 100644 --- a/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/GLUT/2.5.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, freeglut, libICE, libSM, libXi, libXmu, mesa, OpenGL , OpenGLRaw }: diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index 507beef0663..10ab2bf69e6 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -1,11 +1,15 @@ -{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw, vector }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw +, transformers, vector +}: cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.7.4"; - sha256 = "0l1w0k3q5g22y90w5frljqh1v4jb7gjzb3scg79zp42pc9v3h4l5"; + version = "0.7.5"; + sha256 = "1rbnq1nrs2b06ph60lh0yvygk82vvnm8c4d0anhjrqw9i58nd3iz"; buildDepends = [ - cpphs JuicyPixels linear OpenGL OpenGLRaw vector + cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; buildTools = [ cpphs ]; meta = { diff --git a/pkgs/development/libraries/haskell/Glob/default.nix b/pkgs/development/libraries/haskell/Glob/default.nix index 85fe7f2e88e..565f213c42b 100644 --- a/pkgs/development/libraries/haskell/Glob/default.nix +++ b/pkgs/development/libraries/haskell/Glob/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/GlomeVec/default.nix b/pkgs/development/libraries/haskell/GlomeVec/default.nix index 93d4bb8a6da..9eefd570146 100644 --- a/pkgs/development/libraries/haskell/GlomeVec/default.nix +++ b/pkgs/development/libraries/haskell/GlomeVec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, llvm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index 16df77a939e..0a95e90ef4b 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HDBC, mtl, odbc, time, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix index 94fcd71adbd..5ec440e9e34 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, convertible, HDBC, mtl, parsec, postgresql, time , utf8String }: diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix index 783c4c186e2..14ed9499b13 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-sqlite3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HDBC, mtl, sqlite, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC.nix b/pkgs/development/libraries/haskell/HDBC/HDBC.nix index 08134abf843..97cb81415e2 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, convertible, mtl, text, time, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HFuse/default.nix b/pkgs/development/libraries/haskell/HFuse/default.nix index 2012739afb4..04ebefd37fa 100644 --- a/pkgs/development/libraries/haskell/HFuse/default.nix +++ b/pkgs/development/libraries/haskell/HFuse/default.nix @@ -1,21 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fuse }: cabal.mkDerivation (self: { pname = "HFuse"; - version = "0.2.4.1"; - sha256 = "12k04dvh92kk2i68bcb70xnk378qxmh46f241k06di5rkcgwyg1k"; + version = "0.2.4.2"; + sha256 = "043f5x807h1dajd0bvmhln9pjkviszx1279m298w711mrszapqrq"; extraLibraries = [ fuse ]; preConfigure = '' sed -i -e "s@ Extra-Lib-Dirs: /usr/local/lib@ Extra-Lib-Dirs: ${fuse}/lib@" HFuse.cabal - sed -i -e "s@ Include-Dirs: /usr/include, /usr/local/include, .@ Include-Dirs: ${fuse}/include@" HFuse.cabal - sed -i -e "s/LANGUAGE FlexibleContexts/LANGUAGE FlexibleContexts, RankNTypes/" System/Fuse.hsc - sed -i -e "s/E(Exception/E(catch, Exception, IOException/" System/Fuse.hsc - sed -i -e "s/IO(catch,/IO(/" System/Fuse.hsc - sed -i -e "s/IO.catch/ E.catch/" System/Fuse.hsc - sed -i -e "s/const exitFailure/\\\\(_ :: IOException) -> exitFailure/" System/Fuse.hsc ''; meta = { - homepage = "https://github.com/toothbrush/hfuse"; + homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/haskell/HList/default.nix b/pkgs/development/libraries/haskell/HList/default.nix index 15a7741d335..5b971657484 100644 --- a/pkgs/development/libraries/haskell/HList/default.nix +++ b/pkgs/development/libraries/haskell/HList/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, diffutils, doctest, filepath, hspec, lens, mtl , syb, tagged }: diff --git a/pkgs/development/libraries/haskell/HPDF/default.nix b/pkgs/development/libraries/haskell/HPDF/default.nix new file mode 100644 index 00000000000..7dcdbaa8cf9 --- /dev/null +++ b/pkgs/development/libraries/haskell/HPDF/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, mtl, random, vector, zlib }: + +cabal.mkDerivation (self: { + pname = "HPDF"; + version = "1.4.6"; + sha256 = "15v1mf58fqa25higf52jqlf3fw2fbggfm5v8a8v00zz6q0f3lzn9"; + buildDepends = [ binary mtl random vector zlib ]; + meta = { + homepage = "http://www.alpheccar.org"; + description = "Generation of PDF documents"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HStringTemplate/default.nix b/pkgs/development/libraries/haskell/HStringTemplate/default.nix index 0f02d96fcd4..46a6ec75c6a 100644 --- a/pkgs/development/libraries/haskell/HStringTemplate/default.nix +++ b/pkgs/development/libraries/haskell/HStringTemplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, deepseq, filepath, mtl, parsec, syb, text , time, utf8String, void }: diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix index 4ef4c4d7519..5908498bd0a 100644 --- a/pkgs/development/libraries/haskell/HTF/default.nix +++ b/pkgs/development/libraries/haskell/HTF/default.nix @@ -1,20 +1,24 @@ -{ cabal, aeson, cpphs, Diff, filepath, haskellSrcExts, HUnit -, liftedBase, monadControl, mtl, QuickCheck, random, regexCompat -, temporary, text, unorderedContainers, xmlgen +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath +, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck +, random, regexCompat, temporary, text, time, unorderedContainers +, vector, xmlgen }: cabal.mkDerivation (self: { pname = "HTF"; - version = "0.11.3.4"; - sha256 = "0db47fvp33k83dnhvpygprm06p3z397f5ci154vqk7krjpxb2ynx"; + version = "0.12.0.0"; + sha256 = "1mbil44gbcl52f84dphxkdvxsyz8bhc532mlq37aqr1bmj54rv0i"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson cpphs Diff haskellSrcExts HUnit liftedBase monadControl mtl - QuickCheck random regexCompat text xmlgen + aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase + monadControl mtl QuickCheck random regexCompat text time vector + xmlgen ]; testDepends = [ - aeson filepath mtl random regexCompat temporary text + aeson filepath HUnit mtl random regexCompat temporary text unorderedContainers ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix index ac4ac232edf..7eee53b8539 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix index 0beebbfe294..022a9129522 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.0.9.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix index 31cfdddac79..da0db5169af 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix index 8d4a39526b2..109746cff97 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix index f3da4a5ccf2..91b2428ee66 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, httpdShed, HUnit, mtl, network, parsec, split , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix index 583517260ac..ce90b9a9426 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed , httpTypes, HUnit, mtl, network, parsec, pureMD5, split , testFramework, testFrameworkHunit, wai, warp diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix index e6238a5e738..68d4e17f9c2 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, httpdShed, HUnit, mtl, network, parsec, split , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix index d9e422f9e89..fc04221eaac 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, httpdShed, HUnit, mtl, network, parsec, split , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix index 93ba5e949db..dc85bffd643 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes , HUnit, mtl, network, parsec, pureMD5, split, testFramework , testFrameworkHunit, wai, warp diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix index 09f0b25910b..32692c47c42 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.8.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, conduit, deepseq, httpdShed, httpTypes , HUnit, mtl, network, parsec, pureMD5, split, testFramework , testFrameworkHunit, wai, warp diff --git a/pkgs/development/libraries/haskell/HUnit-approx/default.nix b/pkgs/development/libraries/haskell/HUnit-approx/default.nix new file mode 100644 index 00000000000..b507aa21cbb --- /dev/null +++ b/pkgs/development/libraries/haskell/HUnit-approx/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit }: + +cabal.mkDerivation (self: { + pname = "HUnit-approx"; + version = "1.0"; + sha256 = "0svkjvcanjsi5bhn9b91jhig36np5imr3qyj6b1s5msm7wmlk3v1"; + buildDepends = [ HUnit ]; + testDepends = [ HUnit ]; + meta = { + homepage = "https://github.com/goldfirere/HUnit-approx"; + description = "Approximate equality for floating point numbers with HUnit"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix index 01130de10cd..2e317dddfc0 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix index e14aad1a015..01ed60616e6 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix index 2cb9f859f46..302e54fff72 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix index 8ad518ee1f6..05006588a52 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix index 9ac01e70865..9d299a9d36e 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.4.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix index 06ac5fa1bbf..aafabf991e9 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix index b94e0f20733..8883796942b 100644 --- a/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix +++ b/pkgs/development/libraries/haskell/HUnit/1.2.5.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HaXml/default.nix b/pkgs/development/libraries/haskell/HaXml/default.nix index 996437cbeac..54ec9d87d13 100644 --- a/pkgs/development/libraries/haskell/HaXml/default.nix +++ b/pkgs/development/libraries/haskell/HaXml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, polyparse, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix index f20efdae4cf..cbf5e87bccc 100644 --- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix +++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, hxt, hxtHttp, MaybeT, mtl, network, parsec , transformers }: diff --git a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix index 417ded6da54..2d540e73581 100644 --- a/pkgs/development/libraries/haskell/HaskellForMaths/default.nix +++ b/pkgs/development/libraries/haskell/HaskellForMaths/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix index f7ebac247e5..d8d4ee2ece1 100644 --- a/pkgs/development/libraries/haskell/HsOpenSSL/default.nix +++ b/pkgs/development/libraries/haskell/HsOpenSSL/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network, openssl, time }: cabal.mkDerivation (self: { pname = "HsOpenSSL"; - version = "0.10.4"; - sha256 = "1vpidm3jfwlyf61r0g9fks445w4w0kxk3g37fw4slfb1q3xknq2r"; + version = "0.11"; + sha256 = "000c1589yf1lzvw32hh2jacq1da6k2vynh5rymw3rlapxq7skyyr"; buildDepends = [ network time ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/HsSyck/0.51.nix b/pkgs/development/libraries/haskell/HsSyck/0.51.nix index 3033eb7b19d..63c771af7a9 100644 --- a/pkgs/development/libraries/haskell/HsSyck/0.51.nix +++ b/pkgs/development/libraries/haskell/HsSyck/0.51.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashtables, syb, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/HsSyck/0.52.nix b/pkgs/development/libraries/haskell/HsSyck/0.52.nix index 2340c339ea7..c430c7929ef 100644 --- a/pkgs/development/libraries/haskell/HsSyck/0.52.nix +++ b/pkgs/development/libraries/haskell/HsSyck/0.52.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashtables, syb, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix index 8025ef13bc2..8b673dc56be 100644 --- a/pkgs/development/libraries/haskell/IORefCAS/default.nix +++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bitsAtomic, HUnit, QuickCheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IOSpec/default.nix b/pkgs/development/libraries/haskell/IOSpec/default.nix index 84b5f6fe610..6d9a542f9f1 100644 --- a/pkgs/development/libraries/haskell/IOSpec/default.nix +++ b/pkgs/development/libraries/haskell/IOSpec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, Stream }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IfElse/default.nix b/pkgs/development/libraries/haskell/IfElse/default.nix index 960868e3ab0..d2bef1cafa1 100644 --- a/pkgs/development/libraries/haskell/IfElse/default.nix +++ b/pkgs/development/libraries/haskell/IfElse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix index e2b94abd7c8..8df2f0815db 100644 --- a/pkgs/development/libraries/haskell/IntervalMap/default.nix +++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix index 844d512c62f..4e680b26cae 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, JuicyPixels, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 414118f33c9..36347cb4552 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, deepseq, mtl, primitive, transformers, vector , zlib }: diff --git a/pkgs/development/libraries/haskell/List/default.nix b/pkgs/development/libraries/haskell/List/default.nix index 65c90c0824e..7fef7155190 100644 --- a/pkgs/development/libraries/haskell/List/default.nix +++ b/pkgs/development/libraries/haskell/List/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ListLike/default.nix b/pkgs/development/libraries/haskell/ListLike/default.nix index 03c8853cfd7..bec9203c0ee 100644 --- a/pkgs/development/libraries/haskell/ListLike/default.nix +++ b/pkgs/development/libraries/haskell/ListLike/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, fmlist, HUnit, QuickCheck, random, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ListZipper/default.nix b/pkgs/development/libraries/haskell/ListZipper/default.nix index d7307bde5d7..0f3edbaf5f2 100644 --- a/pkgs/development/libraries/haskell/ListZipper/default.nix +++ b/pkgs/development/libraries/haskell/ListZipper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index fe96af2de9e..8e5969bbf27 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -1,19 +1,29 @@ -{ cabal, blazeHtml, blazeMarkup, caseInsensitive, clientsession -, conduit, conduitExtra, cpphs, extensibleExceptions, httpTypes -, monadloc, mtl, parsec, random, RefSerialize, stm, TCache, text -, time, transformers, utf8String, vector, wai, warp, warpTls +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, acidState, aws, blazeHtml, blazeMarkup, caseInsensitive +, clientsession, conduit, conduitExtra, cpphs, extensibleExceptions +, hamlet, hscolour, httpConduit, httpTypes, monadloc, monadLogger +, mtl, network, parsec, persistent, persistentSqlite +, persistentTemplate, pwstoreFast, random, RefSerialize, resourcet +, safecopy, shakespeare, stm, TCache, tcacheAWS, text, time +, transformers, utf8String, vector, wai, waiExtra, warp, warpTls , Workflow }: cabal.mkDerivation (self: { pname = "MFlow"; - version = "0.4.5.4"; - sha256 = "1ih9ni14xmqvcfvayjkggmpmw3s9yzp17gf4xzygldmjcs35j4n3"; + version = "0.4.5.5"; + sha256 = "0ggwzjxhw2xmp2m6a560pn5m0qfn80x5q23vrd2k9aqxh8n2k6i5"; + isLibrary = true; + isExecutable = true; buildDepends = [ - blazeHtml blazeMarkup caseInsensitive clientsession conduit - conduitExtra extensibleExceptions httpTypes monadloc mtl parsec - random RefSerialize stm TCache text time transformers utf8String - vector wai warp warpTls Workflow + acidState aws blazeHtml blazeMarkup caseInsensitive clientsession + conduit conduitExtra extensibleExceptions hamlet hscolour + httpConduit httpTypes monadloc monadLogger mtl network parsec + persistent persistentSqlite persistentTemplate pwstoreFast random + RefSerialize resourcet safecopy shakespeare stm TCache tcacheAWS + text time transformers utf8String vector wai waiExtra warp warpTls + Workflow ]; buildTools = [ cpphs ]; meta = { diff --git a/pkgs/development/libraries/haskell/MaybeT/default.nix b/pkgs/development/libraries/haskell/MaybeT/default.nix index a29997f9de9..069675c2e6a 100644 --- a/pkgs/development/libraries/haskell/MaybeT/default.nix +++ b/pkgs/development/libraries/haskell/MaybeT/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix index 5d8fc314819..15569acf040 100644 --- a/pkgs/development/libraries/haskell/MemoTrie/default.nix +++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, void }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MissingH/default.nix b/pkgs/development/libraries/haskell/MissingH/default.nix index 303a4852649..0c8e7a699e5 100644 --- a/pkgs/development/libraries/haskell/MissingH/default.nix +++ b/pkgs/development/libraries/haskell/MissingH/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, errorcallEqInstance, filepath, hslogger, HUnit, mtl , network, parsec, QuickCheck, random, regexCompat, testpack, time }: diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix index dfaa69bca93..eb5232fabcf 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-mtl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, MonadCatchIOTransformers }: cabal.mkDerivation (self: { @@ -5,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.3.1.0"; sha256 = "0qarf73c8zq8dgvxdiwqybpjfy8gba9vf4k0skiwyk5iphilxhhq"; buildDepends = [ extensibleExceptions MonadCatchIOTransformers ]; + jailbreak = true; meta = { homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; description = "Monad-transformer version of the Control.Exception module"; diff --git a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix index b6402f63abb..9f928bea9de 100644 --- a/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix +++ b/pkgs/development/libraries/haskell/MonadCatchIO-transformers/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, monadsTf, transformers }: cabal.mkDerivation (self: { pname = "MonadCatchIO-transformers"; - version = "0.3.1.0"; - sha256 = "1r5syyalk8a81byhk39yp0j7vdrvlrpppbg52dql1fx6kfhysaxn"; + version = "0.3.1.2"; + sha256 = "1r5c4qz6yp1qrsmk9di35d5kk2dcnaxh2mg3n5kdim991ydzsi1d"; buildDepends = [ extensibleExceptions monadsTf transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/MonadPrompt/default.nix b/pkgs/development/libraries/haskell/MonadPrompt/default.nix index 6d8e66952e4..005af6b99f5 100644 --- a/pkgs/development/libraries/haskell/MonadPrompt/default.nix +++ b/pkgs/development/libraries/haskell/MonadPrompt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/default.nix index 3eac88d8880..6ff8afc58f3 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/default.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index d276697a6d9..2b3746d4973 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ObjectName/default.nix b/pkgs/development/libraries/haskell/ObjectName/default.nix index 27f9b444a71..bda33cee85a 100644 --- a/pkgs/development/libraries/haskell/ObjectName/default.nix +++ b/pkgs/development/libraries/haskell/ObjectName/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OneTuple/default.nix b/pkgs/development/libraries/haskell/OneTuple/default.nix index 945e12438b5..9fcc2cbf253 100644 --- a/pkgs/development/libraries/haskell/OneTuple/default.nix +++ b/pkgs/development/libraries/haskell/OneTuple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenAL/default.nix b/pkgs/development/libraries/haskell/OpenAL/default.nix index 36d3b41583f..e303d177151 100644 --- a/pkgs/development/libraries/haskell/OpenAL/default.nix +++ b/pkgs/development/libraries/haskell/OpenAL/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, openal, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix index 2e4ac90c79e..05de2f88b97 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix index 25133657ccb..887b01afde9 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix index 33e9c4d21a0..a07fa3ec763 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.2.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix index c8cfd796afd..fecdfca2566 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.4.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar , Tensor }: diff --git a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix index 318bdf19748..0506cc608c1 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.6.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, ObjectName, OpenGLRaw, StateVar , Tensor }: diff --git a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix index 72183c86192..a88cb363339 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.8.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, OpenGLRaw }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix index c012c65d522..01af37baaeb 100644 --- a/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix +++ b/pkgs/development/libraries/haskell/OpenGL/2.9.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, GLURaw, libX11, mesa, OpenGLRaw, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix index a6a45bf5b24..ed604b6a1e2 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.3.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix index 1145c16b4f8..c32598e24b0 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.4.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix index f0e6c7ac7ad..fd0331a7311 100644 --- a/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix +++ b/pkgs/development/libraries/haskell/OpenGLRaw/1.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mesa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/PSQueue/default.nix b/pkgs/development/libraries/haskell/PSQueue/default.nix index 32497935cdb..885b0380367 100644 --- a/pkgs/development/libraries/haskell/PSQueue/default.nix +++ b/pkgs/development/libraries/haskell/PSQueue/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix index 3cf80d93336..2c0fb559a16 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix index 6ba32ce71c0..6fce5e94da5 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/1.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix index 2f305b8a23c..c7080090aee 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.1.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix index 4e634078a7d..29944bb6852 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix index e2d274dca05..43275b145be 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix index b3202cdc4b9..1196d5463f5 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix index 24e16a4955f..a31a5e5d585 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.5.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix index 39c97859e65..ff46b19063e 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.6.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix index 8dff2162c2d..2ebd4d2bb01 100644 --- a/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random, testFramework, tfRandom, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix b/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix new file mode 100644 index 00000000000..60667b2afa0 --- /dev/null +++ b/pkgs/development/libraries/haskell/QuickCheck/2.7.6.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, random, testFramework, tfRandom, transformers }: + +cabal.mkDerivation (self: { + pname = "QuickCheck"; + version = "2.7.6"; + sha256 = "09y5l0062l9i5jp9v6811kvkk4zpy0mizwaw44abgz0x1h59gn40"; + buildDepends = [ random tfRandom transformers ]; + testDepends = [ testFramework ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; + meta = { + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 883e7767c6d..60fb815aae2 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG , monadcryptorandom, pureMD5, QuickCheck, SHA, tagged , testFramework, testFrameworkQuickcheck2 @@ -5,10 +7,13 @@ cabal.mkDerivation (self: { pname = "RSA"; - version = "2.0"; - sha256 = "170bjcqd6q8q0c0idjpm9vgn02ifwxz1xvwp1l30qdf56293p4bq"; + version = "2.0.0"; + sha256 = "1v2d6sxpqr0lmiqdr3ym5qzp3p1y57yj6939vdlsac6k6ifj6pwq"; + isLibrary = true; + isExecutable = true; buildDepends = [ - binary cryptoApi cryptoPubkeyTypes monadcryptorandom pureMD5 SHA + binary cryptoApi cryptoPubkeyTypes DRBG monadcryptorandom pureMD5 + QuickCheck SHA tagged testFramework testFrameworkQuickcheck2 ]; testDepends = [ binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA diff --git a/pkgs/development/libraries/haskell/Ranged-sets/default.nix b/pkgs/development/libraries/haskell/Ranged-sets/default.nix index e65752e35b4..b438964e3c5 100644 --- a/pkgs/development/libraries/haskell/Ranged-sets/default.nix +++ b/pkgs/development/libraries/haskell/Ranged-sets/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ReadArgs/default.nix b/pkgs/development/libraries/haskell/ReadArgs/default.nix index 12c3e34571e..484aacb91f0 100644 --- a/pkgs/development/libraries/haskell/ReadArgs/default.nix +++ b/pkgs/development/libraries/haskell/ReadArgs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/RefSerialize/default.nix b/pkgs/development/libraries/haskell/RefSerialize/default.nix index a16ce1332ed..e1d0e4fd953 100644 --- a/pkgs/development/libraries/haskell/RefSerialize/default.nix +++ b/pkgs/development/libraries/haskell/RefSerialize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, hashtables, stringsearch }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 769a1d534ba..bdbae968151 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, typeEquality }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL-image/default.nix b/pkgs/development/libraries/haskell/SDL-image/default.nix index 6c61813ac30..22a17103c5d 100644 --- a/pkgs/development/libraries/haskell/SDL-image/default.nix +++ b/pkgs/development/libraries/haskell/SDL-image/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL, SDL_image }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL-mixer/default.nix b/pkgs/development/libraries/haskell/SDL-mixer/default.nix index 8690d7e8916..d4635565216 100644 --- a/pkgs/development/libraries/haskell/SDL-mixer/default.nix +++ b/pkgs/development/libraries/haskell/SDL-mixer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL, SDL_mixer }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL-ttf/default.nix b/pkgs/development/libraries/haskell/SDL-ttf/default.nix index f1a0489167e..b835d5c5651 100644 --- a/pkgs/development/libraries/haskell/SDL-ttf/default.nix +++ b/pkgs/development/libraries/haskell/SDL-ttf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL, SDL_ttf }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SDL/default.nix b/pkgs/development/libraries/haskell/SDL/default.nix index 2fd9c3e0fb6..a42ee72559d 100644 --- a/pkgs/development/libraries/haskell/SDL/default.nix +++ b/pkgs/development/libraries/haskell/SDL/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, SDL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix index d2bc6929542..b57065a36bb 100644 --- a/pkgs/development/libraries/haskell/SHA/default.nix +++ b/pkgs/development/libraries/haskell/SHA/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { pname = "SHA"; - version = "1.6.4"; - sha256 = "13d7sg8r0qqs425banrwd15hahy8gnl4k81q0wfqld77xpb2vvbj"; + version = "1.6.4.1"; + sha256 = "03fwpl8hrl9q197w8v1glqi5g1d51c7hz4m8zi5s8x1yvpbwcfvl"; isLibrary = true; isExecutable = true; buildDepends = [ binary ]; diff --git a/pkgs/development/libraries/haskell/SHA2/default.nix b/pkgs/development/libraries/haskell/SHA2/default.nix new file mode 100644 index 00000000000..769192146ae --- /dev/null +++ b/pkgs/development/libraries/haskell/SHA2/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, AES, monadsTf, transformers }: + +cabal.mkDerivation (self: { + pname = "SHA2"; + version = "0.2.5"; + sha256 = "1zs79a327x6myfam3p2vr8lmszcaqnkll2qz8n4sy835vz328j40"; + buildDepends = [ AES monadsTf transformers ]; + meta = { + description = "Fast, incremental SHA hashing for bytestrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/SMTPClient/default.nix b/pkgs/development/libraries/haskell/SMTPClient/default.nix index 91c128756f4..7bbb957cb12 100644 --- a/pkgs/development/libraries/haskell/SMTPClient/default.nix +++ b/pkgs/development/libraries/haskell/SMTPClient/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, hsemail, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/STMonadTrans/default.nix b/pkgs/development/libraries/haskell/STMonadTrans/default.nix index d533c167f6c..34ef6152cd2 100644 --- a/pkgs/development/libraries/haskell/STMonadTrans/default.nix +++ b/pkgs/development/libraries/haskell/STMonadTrans/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/SVGFonts/default.nix b/pkgs/development/libraries/haskell/SVGFonts/default.nix index e617190b761..a4bb78eca68 100644 --- a/pkgs/development/libraries/haskell/SVGFonts/default.nix +++ b/pkgs/development/libraries/haskell/SVGFonts/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeMarkup, blazeSvg, dataDefaultClass , diagramsLib, parsec, split, text, tuple, vector, vectorSpace, xml }: diff --git a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix index 6e5e0bf4038..577af377488 100644 --- a/pkgs/development/libraries/haskell/SafeSemaphore/default.nix +++ b/pkgs/development/libraries/haskell/SafeSemaphore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Shellac/Shellac.nix b/pkgs/development/libraries/haskell/Shellac/Shellac.nix index e6f3caac45b..902516ba6e6 100644 --- a/pkgs/development/libraries/haskell/Shellac/Shellac.nix +++ b/pkgs/development/libraries/haskell/Shellac/Shellac.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/StateVar/default.nix b/pkgs/development/libraries/haskell/StateVar/default.nix index 3b27022bea0..d0797aa2f48 100644 --- a/pkgs/development/libraries/haskell/StateVar/default.nix +++ b/pkgs/development/libraries/haskell/StateVar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix index 3bcdb30fd12..99d58423d3b 100644 --- a/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix +++ b/pkgs/development/libraries/haskell/Strafunski-StrategyLib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Stream/default.nix b/pkgs/development/libraries/haskell/Stream/default.nix index 3e622ba2853..2e774ee98c4 100644 --- a/pkgs/development/libraries/haskell/Stream/default.nix +++ b/pkgs/development/libraries/haskell/Stream/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lazysmallcheck, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/TCache/default.nix b/pkgs/development/libraries/haskell/TCache/default.nix index cec80a16d30..5f281ecfb65 100644 --- a/pkgs/development/libraries/haskell/TCache/default.nix +++ b/pkgs/development/libraries/haskell/TCache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashtables, mtl, RefSerialize, stm, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/TableAlgebra/default.nix b/pkgs/development/libraries/haskell/TableAlgebra/default.nix index c4960813f3e..5bcbe278481 100644 --- a/pkgs/development/libraries/haskell/TableAlgebra/default.nix +++ b/pkgs/development/libraries/haskell/TableAlgebra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HaXml, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Tensor/default.nix b/pkgs/development/libraries/haskell/Tensor/default.nix index d62b42833a3..bfcd2722b01 100644 --- a/pkgs/development/libraries/haskell/Tensor/default.nix +++ b/pkgs/development/libraries/haskell/Tensor/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Thrift/default.nix b/pkgs/development/libraries/haskell/Thrift/default.nix new file mode 100644 index 00000000000..6e37fe2ca49 --- /dev/null +++ b/pkgs/development/libraries/haskell/Thrift/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, HTTP, network }: + +cabal.mkDerivation (self: { + pname = "Thrift"; + version = "0.6.0.1"; + sha256 = "0yk496zql0jpyj83ybdzffc03sylf5pwn093k831m99j54l2r5yv"; + buildDepends = [ binary HTTP network ]; + meta = { + homepage = "http://thrift.apache.org"; + description = "Haskell bindings for the Apache Thrift RPC system"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/TypeCompose/default.nix b/pkgs/development/libraries/haskell/TypeCompose/default.nix index 083f438e170..3d52abc656c 100644 --- a/pkgs/development/libraries/haskell/TypeCompose/default.nix +++ b/pkgs/development/libraries/haskell/TypeCompose/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Unixutils/default.nix b/pkgs/development/libraries/haskell/Unixutils/default.nix index 37c1aaf6cef..baabbbc6546 100644 --- a/pkgs/development/libraries/haskell/Unixutils/default.nix +++ b/pkgs/development/libraries/haskell/Unixutils/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, pureMD5, regexTdfa, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Vec/default.nix b/pkgs/development/libraries/haskell/Vec/default.nix index 85fdcfd0b4a..bc4b7eb1454 100644 --- a/pkgs/development/libraries/haskell/Vec/default.nix +++ b/pkgs/development/libraries/haskell/Vec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/Workflow/default.nix b/pkgs/development/libraries/haskell/Workflow/default.nix index 20a30438681..0dbbc1ef5db 100644 --- a/pkgs/development/libraries/haskell/Workflow/default.nix +++ b/pkgs/development/libraries/haskell/Workflow/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, exceptions, extensibleExceptions, mtl , RefSerialize, stm, TCache, vector }: diff --git a/pkgs/development/libraries/haskell/X11-xft/default.nix b/pkgs/development/libraries/haskell/X11-xft/default.nix index 1690ec9031e..4925014517c 100644 --- a/pkgs/development/libraries/haskell/X11-xft/default.nix +++ b/pkgs/development/libraries/haskell/X11-xft/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fontconfig, freetype, libXft, pkgconfig, utf8String, X11 }: diff --git a/pkgs/development/libraries/haskell/X11/default.nix b/pkgs/development/libraries/haskell/X11/default.nix index 64c6d50c609..7a8195c21be 100644 --- a/pkgs/development/libraries/haskell/X11/default.nix +++ b/pkgs/development/libraries/haskell/X11/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, libX11, libXext, libXinerama, libXrandr , libXrender }: diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix new file mode 100644 index 00000000000..a4d1ea666a2 --- /dev/null +++ b/pkgs/development/libraries/haskell/Yampa/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, random }: + +cabal.mkDerivation (self: { + pname = "Yampa"; + version = "0.9.5"; + sha256 = "0r6fm2ccls7gbc5s0vbrzrqv6marnzlzc7zr4afkgfk9jsqfmqjh"; + buildDepends = [ random ]; + meta = { + homepage = "http://www.haskell.org/haskellwiki/Yampa"; + description = "Library for programming hybrid systems"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix index 66db8b44dc5..a5d171f177b 100644 --- a/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque-tests/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractDeque, HUnit, random, testFramework , testFrameworkHunit, time }: diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix index c9df3b5c86a..6102e2f4036 100644 --- a/pkgs/development/libraries/haskell/abstract-deque/default.nix +++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix index 537df70390c..dd853953379 100644 --- a/pkgs/development/libraries/haskell/abstract-par/default.nix +++ b/pkgs/development/libraries/haskell/abstract-par/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index 129c0a81570..5ed99a644f7 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, binary, cryptohash, cuda, fclabels, filepath , hashable, hashtables, languageCQuote, mainlandPretty, mtl , SafeSemaphore, srcloc, text, transformers, unorderedContainers diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index 963a55d2942..cd1b0331639 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, accelerateCuda, accelerateFft, accelerateIo , attoparsec, bmp, bytestringLexing, cereal, criterion, ekg , fclabels, filepath, gloss, glossAccelerate, glossRasterAccelerate diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index 7869b986709..e2f4fade736 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, accelerateCuda, cuda, cufft }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/accelerate-io/default.nix b/pkgs/development/libraries/haskell/accelerate-io/default.nix index 457a2313f6f..8d89d9e7ce0 100644 --- a/pkgs/development/libraries/haskell/accelerate-io/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, bmp, repa, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/accelerate/default.nix b/pkgs/development/libraries/haskell/accelerate/default.nix index 3d60cfddb6c..a32d5fed11c 100644 --- a/pkgs/development/libraries/haskell/accelerate/default.nix +++ b/pkgs/development/libraries/haskell/accelerate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fclabels, hashable, hashtables, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/acid-state/default.nix b/pkgs/development/libraries/haskell/acid-state/default.nix index 066532d117a..c7067dd6602 100644 --- a/pkgs/development/libraries/haskell/acid-state/default.nix +++ b/pkgs/development/libraries/haskell/acid-state/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, extensibleExceptions, filepath, mtl, network , safecopy, stm }: diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index 01441a39ce7..a13113cde4e 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, newtype, QuickCheck, semigroupoids, semigroups , vectorSpace }: diff --git a/pkgs/development/libraries/haskell/adjunctions/default.nix b/pkgs/development/libraries/haskell/adjunctions/default.nix index 74e564af62a..5b9cb5703d6 100644 --- a/pkgs/development/libraries/haskell/adjunctions/default.nix +++ b/pkgs/development/libraries/haskell/adjunctions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, contravariant, distributive, free, mtl , profunctors, semigroupoids, semigroups, tagged, transformers , void diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix index 1b568541a13..7bc2beb3b30 100644 --- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix +++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, cmdargs, text, unorderedContainers , vector }: diff --git a/pkgs/development/libraries/haskell/aeson-qq/default.nix b/pkgs/development/libraries/haskell/aeson-qq/default.nix index 04156f656b6..2090a20fa8d 100644 --- a/pkgs/development/libraries/haskell/aeson-qq/default.nix +++ b/pkgs/development/libraries/haskell/aeson-qq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, haskellSrcMeta, hspec, parsec, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/aeson-utils/default.nix b/pkgs/development/libraries/haskell/aeson-utils/default.nix new file mode 100644 index 00000000000..b0329a4126f --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson-utils/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, scientific, text }: + +cabal.mkDerivation (self: { + pname = "aeson-utils"; + version = "0.2.2.1"; + sha256 = "0sj4kdcxcj2wnf3s109yxq8gghz976hkiqs19bjcp6qkzdf5w6sd"; + buildDepends = [ aeson attoparsec scientific text ]; + meta = { + description = "Utilities for working with Aeson"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix index b5c959bb617..d6cdf9a0d2a 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit , mtl, QuickCheck, scientific, syb, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text, time diff --git a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix index 96a93b40195..955248de5b3 100644 --- a/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix +++ b/pkgs/development/libraries/haskell/aeson/0.7.0.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit , mtl, QuickCheck, scientific, syb, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text, time diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix new file mode 100644 index 00000000000..cfb256eb9b7 --- /dev/null +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.0.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, blazeBuilder, deepseq, dlist, hashable, HUnit +, mtl, QuickCheck, scientific, syb, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "aeson"; + version = "0.8.0.0"; + sha256 = "0p2x03wjawhav87jp57vwclra0gjwn1gqk74zgnji25ypwsvgkk4"; + buildDepends = [ + attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb + text time unorderedContainers vector + ]; + testDepends = [ + attoparsec HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 text time unorderedContainers vector + ]; + meta = { + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/alsa-core/default.nix b/pkgs/development/libraries/haskell/alsa-core/default.nix index f38082fba88..84f1485856f 100644 --- a/pkgs/development/libraries/haskell/alsa-core/default.nix +++ b/pkgs/development/libraries/haskell/alsa-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alsaLib, extensibleExceptions }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/alsa-mixer/default.nix b/pkgs/development/libraries/haskell/alsa-mixer/default.nix index 2b3961f5cf1..0e097223f84 100644 --- a/pkgs/development/libraries/haskell/alsa-mixer/default.nix +++ b/pkgs/development/libraries/haskell/alsa-mixer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alsaCore, alsaLib, c2hs }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/alsa-pcm/default.nix b/pkgs/development/libraries/haskell/alsa-pcm/default.nix index 7ac221299fd..e1ac0ea257e 100644 --- a/pkgs/development/libraries/haskell/alsa-pcm/default.nix +++ b/pkgs/development/libraries/haskell/alsa-pcm/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alsaCore, alsaLib, extensibleExceptions, sampleFrame , storableRecord }: cabal.mkDerivation (self: { pname = "alsa-pcm"; - version = "0.6.0.2"; - sha256 = "0zckp83wdqb6nl2k63fapa5h4vf1xyvbaycd0ixwr9k7mw75q7b9"; + version = "0.6.0.3"; + sha256 = "0rq0i17xhd0x7dnlhdf3i1fdvmyxrsbm0w0k9lrx20xpy4gw2zfs"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/amqp/default.nix b/pkgs/development/libraries/haskell/amqp/default.nix index 8256ff54e19..2fefde3a8ca 100644 --- a/pkgs/development/libraries/haskell/amqp/default.nix +++ b/pkgs/development/libraries/haskell/amqp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, clock, connection, dataBinaryIeee754, hspec , hspecExpectations, monadControl, network, split, text, vector , xml @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "amqp"; - version = "0.8.3"; - sha256 = "0gl5vdhbic8llhbqmhnwj0wvykhbrci6zz53v5cayqfcwi1v1dw2"; + version = "0.9"; + sha256 = "10yacflzvf7y21yi6frs88gdbhf5g4j99ag8mwv6jrwfzwqszs5j"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix index f084fda35c5..efefdc78f0d 100644 --- a/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/annotated-wl-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ansi-terminal/default.nix b/pkgs/development/libraries/haskell/ansi-terminal/default.nix index 59eb51845b8..aeaae88f17f 100644 --- a/pkgs/development/libraries/haskell/ansi-terminal/default.nix +++ b/pkgs/development/libraries/haskell/ansi-terminal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix index 51034652e1e..5291fa8dc0f 100644 --- a/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/ansi-wl-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/appar/default.nix b/pkgs/development/libraries/haskell/appar/default.nix index 4c2f5a9ce46..ef135f57766 100644 --- a/pkgs/development/libraries/haskell/appar/default.nix +++ b/pkgs/development/libraries/haskell/appar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/applicative-quoters/default.nix b/pkgs/development/libraries/haskell/applicative-quoters/default.nix new file mode 100644 index 00000000000..84bd2e1e438 --- /dev/null +++ b/pkgs/development/libraries/haskell/applicative-quoters/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, haskellSrcMeta }: + +cabal.mkDerivation (self: { + pname = "applicative-quoters"; + version = "0.1.0.8"; + sha256 = "10m29d0938khjdazsmsvvncr5xndnpzpm1b7ymzb3b4b81xmcpgl"; + buildDepends = [ haskellSrcMeta ]; + meta = { + description = "Quasiquoters for idiom brackets and an applicative do-notation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index 5baf9f63326..dc3acd668ed 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bert, Cabal, haskellNames, haskellPackages, haskellSrcExts , mtl, utf8String }: diff --git a/pkgs/development/libraries/haskell/arithmoi/default.nix b/pkgs/development/libraries/haskell/arithmoi/default.nix index c027a92c38d..91797435ceb 100644 --- a/pkgs/development/libraries/haskell/arithmoi/default.nix +++ b/pkgs/development/libraries/haskell/arithmoi/default.nix @@ -1,10 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, random }: cabal.mkDerivation (self: { pname = "arithmoi"; - version = "0.4.1.0"; - sha256 = "1xmwxmvl9l1fa2sgr4ff7al8b5d5136h4fq9r05abj3nfnx1a0iq"; + version = "0.4.1.1"; + sha256 = "02wrm24dpcsdsjaic30416axad5s4y822si1am4smb2qvrhps9ix"; buildDepends = [ mtl random ]; + configureFlags = "-f-llvm"; jailbreak = true; meta = { homepage = "https://bitbucket.org/dafis/arithmoi"; diff --git a/pkgs/development/libraries/haskell/arrows/default.nix b/pkgs/development/libraries/haskell/arrows/default.nix index 149f5f951e5..e60c580347f 100644 --- a/pkgs/development/libraries/haskell/arrows/default.nix +++ b/pkgs/development/libraries/haskell/arrows/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Stream }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-data/default.nix b/pkgs/development/libraries/haskell/asn1-data/default.nix index a90e8e769e2..8b813fc02dc 100644 --- a/pkgs/development/libraries/haskell/asn1-data/default.nix +++ b/pkgs/development/libraries/haskell/asn1-data/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix index 623657ee762..1cc87f5ce5e 100644 --- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix +++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Types, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix index 16386d939e4..5786823ce7b 100644 --- a/pkgs/development/libraries/haskell/asn1-parse/default.nix +++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index 8b259e7aada..ad9492bf3fa 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/assert-failure/default.nix b/pkgs/development/libraries/haskell/assert-failure/default.nix index b5cc0bdc446..2ba1b50c5ca 100644 --- a/pkgs/development/libraries/haskell/assert-failure/default.nix +++ b/pkgs/development/libraries/haskell/assert-failure/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, prettyShow, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/async/2.0.1.3.nix b/pkgs/development/libraries/haskell/async/2.0.1.3.nix index a17e1fb8686..e63a201b1e0 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.3.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/async/2.0.1.4.nix b/pkgs/development/libraries/haskell/async/2.0.1.4.nix index 24fa64931a3..0813579c0b7 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.4.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/async/2.0.1.5.nix b/pkgs/development/libraries/haskell/async/2.0.1.5.nix index d3340fb3678..7f3003de568 100644 --- a/pkgs/development/libraries/haskell/async/2.0.1.5.nix +++ b/pkgs/development/libraries/haskell/async/2.0.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/atomic-primops/default.nix b/pkgs/development/libraries/haskell/atomic-primops/default.nix index 59d02ce7649..127ee2b326c 100644 --- a/pkgs/development/libraries/haskell/atomic-primops/default.nix +++ b/pkgs/development/libraries/haskell/atomic-primops/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attempt/default.nix b/pkgs/development/libraries/haskell/attempt/default.nix index 2546748ee1e..30fd30b35d1 100644 --- a/pkgs/development/libraries/haskell/attempt/default.nix +++ b/pkgs/development/libraries/haskell/attempt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, failure }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index 4f0bffa5020..9ee9ecd7a28 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, blazeTextual, deepseq, HUnit , testFramework, testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix index 623ae104090..e0950ef517b 100644 --- a/pkgs/development/libraries/haskell/attoparsec-binary/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-binary/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix index 21a15ea80e7..0f240f8d31f 100644 --- a/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix index 98f8f426ba3..ceea762f7de 100644 --- a/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/attoparsec-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, enumerator, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix index c352ce7ca8e..235f0f2c8b7 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.10.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix index 84e7f6147a7..8a1a341ceb2 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, scientific, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix index 4af501e7dca..ebb1f33f29e 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.11.3.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, scientific, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix index 72a58b1cce6..e17fd13741a 100644 --- a/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix +++ b/pkgs/development/libraries/haskell/attoparsec/0.12.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, QuickCheck, scientific, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch b/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch deleted file mode 100644 index 6a888aa3277..00000000000 --- a/pkgs/development/libraries/haskell/authenticate-oauth/RSA2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c401c2c585b5345243211e981c123a92b995b448 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Sat, 25 Jan 2014 13:35:52 +0300 -Subject: [PATCH] authenticate-oauth.cabal: allow RSA-2 - -The only cosmetic change is rename of 'ha_SHA1' to 'hashSHA1' - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - authenticate-oauth/Web/Authenticate/OAuth.hs | 10 ++++++++-- - authenticate-oauth/authenticate-oauth.cabal | 2 +- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/authenticate-oauth/Web/Authenticate/OAuth.hs b/authenticate-oauth/Web/Authenticate/OAuth.hs -index 3f38c8c..eccd0f1 100644 ---- a/authenticate-oauth/Web/Authenticate/OAuth.hs -+++ b/authenticate-oauth/Web/Authenticate/OAuth.hs -@@ -21,7 +21,7 @@ module Web.Authenticate.OAuth - paramEncode, addScope, addMaybeProxy - ) where - import Blaze.ByteString.Builder (toByteString, Builder) --import Codec.Crypto.RSA (ha_SHA1, rsassa_pkcs1_v1_5_sign) -+import qualified Codec.Crypto.RSA as RSA - import Control.Exception - import Control.Monad - import Control.Monad.IO.Class (MonadIO, liftIO) -@@ -346,7 +346,13 @@ genSign oa tok req = - PLAINTEXT -> - return $ BS.intercalate "&" $ map paramEncode [oauthConsumerSecret oa, tokenSecret tok] - RSASHA1 pr -> -- liftM (encode . toStrict . rsassa_pkcs1_v1_5_sign ha_SHA1 pr) (getBaseString tok req) -+ liftM (encode . toStrict . RSA.rsassa_pkcs1_v1_5_sign -+#if MIN_VERSION_RSA(2, 0, 0) -+ RSA.hashSHA1 -+#else -+ RSA.ha_SHA1 -+#endif -+ pr) (getBaseString tok req) - - #if MIN_VERSION_http_conduit(2, 0, 0) - addAuthHeader :: BS.ByteString -> Credential -> Request -> Request -diff --git a/authenticate-oauth/authenticate-oauth.cabal b/authenticate-oauth/authenticate-oauth.cabal -index 00507da..e11c3bd 100644 ---- a/authenticate-oauth/authenticate-oauth.cabal -+++ b/authenticate-oauth/authenticate-oauth.cabal -@@ -19,7 +19,7 @@ library - , transformers >= 0.1 && < 0.4 - , bytestring >= 0.9 - , crypto-pubkey-types >= 0.1 && < 0.5 -- , RSA >= 1.2 && < 1.3 -+ , RSA >= 1.2 && < 2.1 - , time - , data-default - , base64-bytestring >= 0.1 && < 1.1 --- -1.9.1 - diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index 9a75bd0cea5..8f6c15bdd71 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -1,18 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, blazeBuilderConduit -, conduit, cryptoPubkeyTypes, dataDefault, httpConduit, httpTypes -, monadControl, random, resourcet, RSA, SHA, time, transformers +, cryptoPubkeyTypes, dataDefault, httpClient, httpTypes, random +, RSA, SHA, time, transformers }: cabal.mkDerivation (self: { pname = "authenticate-oauth"; - version = "1.4.0.8"; - sha256 = "1mc36d6lkmqywzsxhzwv4445mmwdz0rr5ibd2a1nbgw5c5jw76fy"; - patches = [ ./RSA2.patch ]; - patchFlags = "-p2"; + version = "1.5"; + sha256 = "07y9zh4v9by588k86wlyj3czivj5jlb9jk6g4j9p8j1qgbv4hpk9"; buildDepends = [ - base64Bytestring blazeBuilder blazeBuilderConduit conduit - cryptoPubkeyTypes dataDefault httpConduit httpTypes monadControl - random resourcet RSA SHA time transformers + base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes + dataDefault httpClient httpTypes random RSA SHA time transformers ]; meta = { homepage = "http://github.com/yesodweb/authenticate"; diff --git a/pkgs/development/libraries/haskell/authenticate/default.nix b/pkgs/development/libraries/haskell/authenticate/default.nix index 884f4175ba5..381f9d81d01 100644 --- a/pkgs/development/libraries/haskell/authenticate/default.nix +++ b/pkgs/development/libraries/haskell/authenticate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeBuilder, caseInsensitive, conduit , httpConduit, httpTypes, monadControl, network, resourcet , tagstreamConduit, text, transformers, unorderedContainers diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 7394583c667..b50a61f9157 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, base16Bytestring, base64Bytestring, blazeBuilder , byteable, caseInsensitive, cereal, conduit, conduitExtra , cryptohash, dataDefault, filepath, httpConduit, httpTypes @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.9"; - sha256 = "07sdz179vqfdcnm6rrdg068xdyqw8m2565bdba5a1s987vdvps21"; + version = "0.9.1"; + sha256 = "1fp18j8my9v7d6z0d28bc1hjzrs9znf3c986950pfpv2bsiw7m6d"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/base-compat/default.nix b/pkgs/development/libraries/haskell/base-compat/default.nix index 83cde5c0512..6714ad547de 100644 --- a/pkgs/development/libraries/haskell/base-compat/default.nix +++ b/pkgs/development/libraries/haskell/base-compat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, errorcallEqInstance, hspec, QuickCheck, setenv }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix index 3eccd0a4ffa..679235a49b3 100644 --- a/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix +++ b/pkgs/development/libraries/haskell/base-unicode-symbols/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/base16-bytestring/default.nix b/pkgs/development/libraries/haskell/base16-bytestring/default.nix index 3de2bdf60ff..29dedfe95f9 100644 --- a/pkgs/development/libraries/haskell/base16-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base16-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/base64-bytestring/default.nix b/pkgs/development/libraries/haskell/base64-bytestring/default.nix index 6b753f7b980..6ab860e09ab 100644 --- a/pkgs/development/libraries/haskell/base64-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/base64-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/base64-conduit/default.nix b/pkgs/development/libraries/haskell/base64-conduit/default.nix index 0fa5a02d5a5..a71d1282443 100644 --- a/pkgs/development/libraries/haskell/base64-conduit/default.nix +++ b/pkgs/development/libraries/haskell/base64-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, conduit, hspec, QuickCheck, transformers }: diff --git a/pkgs/development/libraries/haskell/base64-string/default.nix b/pkgs/development/libraries/haskell/base64-string/default.nix index 9e0a781039b..f68c53d3601 100644 --- a/pkgs/development/libraries/haskell/base64-string/default.nix +++ b/pkgs/development/libraries/haskell/base64-string/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index b923e444b1e..ab462229aa5 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, liftedBase, ReadArgs, safe, systemFilepath, text , transformers, unorderedContainers, vector }: diff --git a/pkgs/development/libraries/haskell/benchpress/default.nix b/pkgs/development/libraries/haskell/benchpress/default.nix index 9218e50b767..d502e0919cc 100644 --- a/pkgs/development/libraries/haskell/benchpress/default.nix +++ b/pkgs/development/libraries/haskell/benchpress/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bert/default.nix b/pkgs/development/libraries/haskell/bert/default.nix index 96c421b708d..217966c1426 100644 --- a/pkgs/development/libraries/haskell/bert/default.nix +++ b/pkgs/development/libraries/haskell/bert/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, binary, binaryConduit, conduit, conduitExtra, mtl , network, parsec, smallcheck, tasty, tastyHunit, tastySmallcheck , time, void diff --git a/pkgs/development/libraries/haskell/bifunctors/default.nix b/pkgs/development/libraries/haskell/bifunctors/default.nix index df15bd93a40..8bbfddd781a 100644 --- a/pkgs/development/libraries/haskell/bifunctors/default.nix +++ b/pkgs/development/libraries/haskell/bifunctors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroupoids, semigroups, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bimap/default.nix b/pkgs/development/libraries/haskell/bimap/default.nix index 98814e75a9d..3550581d4d1 100644 --- a/pkgs/development/libraries/haskell/bimap/default.nix +++ b/pkgs/development/libraries/haskell/bimap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix index 4126910db75..6ee88b981bb 100644 --- a/pkgs/development/libraries/haskell/binary-conduit/default.nix +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, conduit, hspec, QuickCheck, quickcheckAssertions , resourcet, vector }: cabal.mkDerivation (self: { pname = "binary-conduit"; - version = "1.2.1.1"; - sha256 = "0f6ki793fbgxpsqadfj796b4rbv6zhn4v4rrd48r48zzw9hmxmzd"; + version = "1.2.2"; + sha256 = "12dgqydc4zj1ffrcfqpd1dg40dc9hpynj1j69611kzpcqbj275pf"; buildDepends = [ binary conduit resourcet vector ]; testDepends = [ binary conduit hspec QuickCheck quickcheckAssertions resourcet diff --git a/pkgs/development/libraries/haskell/binary-shared/default.nix b/pkgs/development/libraries/haskell/binary-shared/default.nix index 4033565684d..bf2d662a589 100644 --- a/pkgs/development/libraries/haskell/binary-shared/default.nix +++ b/pkgs/development/libraries/haskell/binary-shared/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix index f378b8d7c41..6366ecf6760 100644 --- a/pkgs/development/libraries/haskell/binary/0.6.1.0.nix +++ b/pkgs/development/libraries/haskell/binary/0.6.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix index bf91922835d..fbb640d5b41 100644 --- a/pkgs/development/libraries/haskell/binary/0.7.2.1.nix +++ b/pkgs/development/libraries/haskell/binary/0.7.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HUnit, QuickCheck, random, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/bindings-DSL/default.nix b/pkgs/development/libraries/haskell/bindings-DSL/default.nix index 223760b291a..846f5d6486d 100644 --- a/pkgs/development/libraries/haskell/bindings-DSL/default.nix +++ b/pkgs/development/libraries/haskell/bindings-DSL/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix index a5fef2474a7..0ed43d79537 100644 --- a/pkgs/development/libraries/haskell/bindings-GLFW/default.nix +++ b/pkgs/development/libraries/haskell/bindings-GLFW/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL, HUnit, libX11, libXext, libXfixes, libXi , libXrandr, libXxf86vm, mesa, testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/bindings-libusb/default.nix b/pkgs/development/libraries/haskell/bindings-libusb/default.nix index aeea654577a..1c2538dba17 100644 --- a/pkgs/development/libraries/haskell/bindings-libusb/default.nix +++ b/pkgs/development/libraries/haskell/bindings-libusb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL, libusb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix index 8bdf30e36d1..49caa0e491e 100644 --- a/pkgs/development/libraries/haskell/bindings-posix/default.nix +++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bitarray/default.nix b/pkgs/development/libraries/haskell/bitarray/default.nix index edda97480d8..2a01ea92a08 100644 --- a/pkgs/development/libraries/haskell/bitarray/default.nix +++ b/pkgs/development/libraries/haskell/bitarray/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bitmap/default.nix b/pkgs/development/libraries/haskell/bitmap/default.nix index b120c8cf953..790b068b3d6 100644 --- a/pkgs/development/libraries/haskell/bitmap/default.nix +++ b/pkgs/development/libraries/haskell/bitmap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix index e6add5883aa..4d5b0909b76 100644 --- a/pkgs/development/libraries/haskell/bits-atomic/default.nix +++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bktrees/default.nix b/pkgs/development/libraries/haskell/bktrees/default.nix index 70369034eaa..a070bb2b197 100644 --- a/pkgs/development/libraries/haskell/bktrees/default.nix +++ b/pkgs/development/libraries/haskell/bktrees/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix index 1c6670f17ab..554328275f5 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix index d08edb48b0e..261935d5c23 100644 --- a/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, enumerator, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-builder/default.nix b/pkgs/development/libraries/haskell/blaze-builder/default.nix index 51dda936687..4672a3f34cf 100644 --- a/pkgs/development/libraries/haskell/blaze-builder/default.nix +++ b/pkgs/development/libraries/haskell/blaze-builder/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-from-html/default.nix b/pkgs/development/libraries/haskell/blaze-from-html/default.nix new file mode 100644 index 00000000000..4897e750556 --- /dev/null +++ b/pkgs/development/libraries/haskell/blaze-from-html/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, tagsoup }: + +cabal.mkDerivation (self: { + pname = "blaze-from-html"; + version = "0.3.2.1"; + sha256 = "1li3zxrgwj5rgk894d9zwfxnx5dfjzkvjlcyck2g7s0awfp2kq4s"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath tagsoup ]; + meta = { + homepage = "http://jaspervdj.be/blaze"; + description = "Tool to convert HTML to BlazeHtml code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix index d061ecf5486..c470f1f55ca 100644 --- a/pkgs/development/libraries/haskell/blaze-html/default.nix +++ b/pkgs/development/libraries/haskell/blaze-html/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, blazeMarkup, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/blaze-markup/default.nix b/pkgs/development/libraries/haskell/blaze-markup/default.nix index 07dfe2eb477..eecb8cef272 100644 --- a/pkgs/development/libraries/haskell/blaze-markup/default.nix +++ b/pkgs/development/libraries/haskell/blaze-markup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/blaze-svg/default.nix b/pkgs/development/libraries/haskell/blaze-svg/default.nix index 92a25e5e3b4..bf5bc4c262c 100644 --- a/pkgs/development/libraries/haskell/blaze-svg/default.nix +++ b/pkgs/development/libraries/haskell/blaze-svg/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeMarkup, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/blaze-textual/default.nix b/pkgs/development/libraries/haskell/blaze-textual/default.nix index 508e68fa045..a6228000b12 100644 --- a/pkgs/development/libraries/haskell/blaze-textual/default.nix +++ b/pkgs/development/libraries/haskell/blaze-textual/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, doubleConversion, QuickCheck, testFramework , testFrameworkQuickcheck2, text, time, vector }: diff --git a/pkgs/development/libraries/haskell/bloomfilter/default.nix b/pkgs/development/libraries/haskell/bloomfilter/default.nix index 7c8c2d34849..2494f08eaac 100644 --- a/pkgs/development/libraries/haskell/bloomfilter/default.nix +++ b/pkgs/development/libraries/haskell/bloomfilter/default.nix @@ -1,10 +1,21 @@ -{ cabal, deepseq }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, QuickCheck, random, testFramework +, testFrameworkQuickcheck2 +}: cabal.mkDerivation (self: { pname = "bloomfilter"; - version = "1.2.6.10"; - sha256 = "162vp9riwf5q2l1hnw3g157fpwnw185fk41hkgyf8qaavcrz6slv"; + version = "2.0.0.0"; + sha256 = "07fif8i5rinysli1mpi92k405kvw8va7w9v9w4wd5bylb87zy77f"; buildDepends = [ deepseq ]; + # https://github.com/bos/bloomfilter/pull/8 + preConfigure = '' + sed -i -e "s/0xffffffff/0x7fffffff/" Data/BloomFilter/Easy.hs + ''; + testDepends = [ + QuickCheck random testFramework testFrameworkQuickcheck2 + ]; meta = { homepage = "https://github.com/bos/bloomfilter"; description = "Pure and impure Bloom Filter implementations"; diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix index 63a86d82bb6..6d04a1ce6af 100644 --- a/pkgs/development/libraries/haskell/bmp/default.nix +++ b/pkgs/development/libraries/haskell/bmp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bool-extras/default.nix b/pkgs/development/libraries/haskell/bool-extras/default.nix index 20185638b59..f180670f9b9 100644 --- a/pkgs/development/libraries/haskell/bool-extras/default.nix +++ b/pkgs/development/libraries/haskell/bool-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 74a4385aa92..b5d5bc74f80 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.4.2"; - sha256 = "0vy70anwnh7649za6nzb65fx09vqkf50a961da6gzwvbaf526rd0"; + version = "1.4.3"; + sha256 = "1i72mrl8n2cbrdi05zn37y1339r13vzvmrcc1zbkcak4c7r004zw"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix index 3dfd986ee62..ed291fcbbc5 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, linear, QuickCheck, random, testFramework , testFrameworkQuickcheck2, testFrameworkTh }: diff --git a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix index 44c8b3fee6f..686f4ffbbab 100644 --- a/pkgs/development/libraries/haskell/boundingboxes/0.2.nix +++ b/pkgs/development/libraries/haskell/boundingboxes/0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, linear, QuickCheck, random, testFramework , testFrameworkQuickcheck2, testFrameworkTh }: diff --git a/pkgs/development/libraries/haskell/boxes/default.nix b/pkgs/development/libraries/haskell/boxes/default.nix index 008a8f3b565..aa2a95b621d 100644 --- a/pkgs/development/libraries/haskell/boxes/default.nix +++ b/pkgs/development/libraries/haskell/boxes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, split }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/brainfuck/default.nix b/pkgs/development/libraries/haskell/brainfuck/default.nix index a406d1fa500..9b0d2eb12bf 100644 --- a/pkgs/development/libraries/haskell/brainfuck/default.nix +++ b/pkgs/development/libraries/haskell/brainfuck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bson/default.nix b/pkgs/development/libraries/haskell/bson/default.nix index da4629e93fb..f46809f6915 100644 --- a/pkgs/development/libraries/haskell/bson/default.nix +++ b/pkgs/development/libraries/haskell/bson/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptohash, dataBinaryIeee754, mtl, network , QuickCheck, testFramework, testFrameworkQuickcheck2, text, time }: cabal.mkDerivation (self: { pname = "bson"; - version = "0.2.4"; - sha256 = "1fr0xx9q2l3cb72j5lgrwdlr2gba7idh2v80s8d6dr69dhwaccd9"; + version = "0.3"; + sha256 = "0787z6970lf93mgrsyqcilnkx5bynny88ag15z2f07l1rhva6ac4"; buildDepends = [ binary cryptohash dataBinaryIeee754 mtl network text time ]; diff --git a/pkgs/development/libraries/haskell/bv/default.nix b/pkgs/development/libraries/haskell/bv/default.nix index d99779f8cd4..a5583e5b343 100644 --- a/pkgs/development/libraries/haskell/bv/default.nix +++ b/pkgs/development/libraries/haskell/bv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/byteable/default.nix b/pkgs/development/libraries/haskell/byteable/default.nix index 6e527cc9958..9adc98599e5 100644 --- a/pkgs/development/libraries/haskell/byteable/default.nix +++ b/pkgs/development/libraries/haskell/byteable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytedump/default.nix b/pkgs/development/libraries/haskell/bytedump/default.nix index 8290717fa4b..3031f53d839 100644 --- a/pkgs/development/libraries/haskell/bytedump/default.nix +++ b/pkgs/development/libraries/haskell/bytedump/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/byteorder/default.nix b/pkgs/development/libraries/haskell/byteorder/default.nix index 86de1da9328..99bfd6c2140 100644 --- a/pkgs/development/libraries/haskell/byteorder/default.nix +++ b/pkgs/development/libraries/haskell/byteorder/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix index cb647f2cb16..fac15f1d4b8 100644 --- a/pkgs/development/libraries/haskell/bytes/default.nix +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, doctest, filepath, mtl, text, time , transformers, transformersCompat, void }: diff --git a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix index 9a013c9f245..0ac2f1c63a8 100644 --- a/pkgs/development/libraries/haskell/bytestring-lexing/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-lexing/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix index 5f9e322fbf0..4486ae8da45 100644 --- a/pkgs/development/libraries/haskell/bytestring-mmap/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-mmap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-nums/default.nix b/pkgs/development/libraries/haskell/bytestring-nums/default.nix index e78a6478151..400529b026a 100644 --- a/pkgs/development/libraries/haskell/bytestring-nums/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-nums/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-progress/default.nix b/pkgs/development/libraries/haskell/bytestring-progress/default.nix index e9bb268b9fc..33d6a17b029 100644 --- a/pkgs/development/libraries/haskell/bytestring-progress/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-progress/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, terminalProgressBar, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-show/default.nix b/pkgs/development/libraries/haskell/bytestring-show/default.nix index 19b8f15bc6d..c36bf611ab4 100644 --- a/pkgs/development/libraries/haskell/bytestring-show/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-show/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bytestring-trie/default.nix b/pkgs/development/libraries/haskell/bytestring-trie/default.nix index 41c31b1fed5..b827c831ffa 100644 --- a/pkgs/development/libraries/haskell/bytestring-trie/default.nix +++ b/pkgs/development/libraries/haskell/bytestring-trie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/bzlib/default.nix b/pkgs/development/libraries/haskell/bzlib/default.nix index cc9f244261b..9699cd8cad6 100644 --- a/pkgs/development/libraries/haskell/bzlib/default.nix +++ b/pkgs/development/libraries/haskell/bzlib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bzip2 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index efde2daedeb..bd86e705e7d 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, HUnit, languageC, shelly, testFramework , testFrameworkHunit, text, yaml }: diff --git a/pkgs/development/libraries/haskell/c2hsc/default.nix b/pkgs/development/libraries/haskell/c2hsc/default.nix index ac52a88e63b..cf56c0bf545 100644 --- a/pkgs/development/libraries/haskell/c2hsc/default.nix +++ b/pkgs/development/libraries/haskell/c2hsc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, filepath, HStringTemplate, languageC, mtl, split , transformers }: diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 9ba31d333bb..4e891196a50 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens , strict, systemFileio, systemFilepath, tasty, tastyGolden, text , transformers, unorderedContainers diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix index 55b4fea36fe..53a9794883a 100644 --- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix +++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index bd14dd1c089..79693a7139f 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, lens, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cabal-macosx/default.nix b/pkgs/development/libraries/haskell/cabal-macosx/default.nix index be59a3897c2..7eb36551017 100644 --- a/pkgs/development/libraries/haskell/cabal-macosx/default.nix +++ b/pkgs/development/libraries/haskell/cabal-macosx/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, fgl, filepath, parsec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 25029618b23..b46b8508e9a 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, gtk2hsBuildtools, libc, mtl, pkgconfig, utf8String , zlib }: diff --git a/pkgs/development/libraries/haskell/carray/default.nix b/pkgs/development/libraries/haskell/carray/default.nix index 7fa22dfa2eb..42fbad8b07d 100644 --- a/pkgs/development/libraries/haskell/carray/default.nix +++ b/pkgs/development/libraries/haskell/carray/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, ixShapable, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix index ede59ad22cd..6e6cca30c9a 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix index 083fa7df370..ef1e1112601 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.0.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix index 45cc7c11fc2..08340bbb976 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.1.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix index aa8996b0fc3..c8c544610e3 100644 --- a/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/case-insensitive/1.2.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, HUnit, testFramework , testFrameworkHunit, text }: diff --git a/pkgs/development/libraries/haskell/cassava/default.nix b/pkgs/development/libraries/haskell/cassava/default.nix index 745969058f0..ab93dc44196 100644 --- a/pkgs/development/libraries/haskell/cassava/default.nix +++ b/pkgs/development/libraries/haskell/cassava/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text , unorderedContainers, vector diff --git a/pkgs/development/libraries/haskell/categories/default.nix b/pkgs/development/libraries/haskell/categories/default.nix index 54483f17701..e8ff4f3e6a5 100644 --- a/pkgs/development/libraries/haskell/categories/default.nix +++ b/pkgs/development/libraries/haskell/categories/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, void }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cautious-file/default.nix b/pkgs/development/libraries/haskell/cautious-file/default.nix index 44ed255bb63..ff13129c2cf 100644 --- a/pkgs/development/libraries/haskell/cautious-file/default.nix +++ b/pkgs/development/libraries/haskell/cautious-file/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cereal-conduit/default.nix b/pkgs/development/libraries/haskell/cereal-conduit/default.nix index 56c4a01d9d8..e15d10bd45b 100644 --- a/pkgs/development/libraries/haskell/cereal-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cereal-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, conduit, HUnit, mtl, resourcet, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cereal/default.nix b/pkgs/development/libraries/haskell/cereal/default.nix index 94b5033e7ef..99b77033a96 100644 --- a/pkgs/development/libraries/haskell/cereal/default.nix +++ b/pkgs/development/libraries/haskell/cereal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/certificate/default.nix b/pkgs/development/libraries/haskell/certificate/default.nix index 95b990b464b..06363b8e335 100644 --- a/pkgs/development/libraries/haskell/certificate/default.nix +++ b/pkgs/development/libraries/haskell/certificate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Data, cryptohash, cryptoPubkeyTypes, filepath, mtl , pem, time }: diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix index 60669590c2f..0373daf9fa7 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix index bf1920d434d..16322e0f74c 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix index c1dc7076c77..2d186604033 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix index 97e5556bacd..82ba74c14aa 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix index 284c1ee2c05..2c9e4248e1c 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.7.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix index 0e6a6a71ae9..f01feb3edf6 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.1.8.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MonadCatchIOMtl, mtl, network, parsec, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix new file mode 100644 index 00000000000..fa4035b41ab --- /dev/null +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ansiTerminal, cmdargs, dlist, filepath, regexPosix, safe +, split, stm, stringsearch, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "cgrep"; + version = "6.4.4"; + sha256 = "1czy9skv3jcfljwxml4nprmsxq70pav7mqhk92jg5wj1klgrz21k"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + ansiTerminal cmdargs dlist filepath regexPosix safe split stm + stringsearch unorderedContainers + ]; + meta = { + homepage = "http://awgn.github.io/cgrep/"; + description = "Command line tool"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/charset/default.nix b/pkgs/development/libraries/haskell/charset/default.nix index 8a0f1e62179..1b37fd77bd9 100644 --- a/pkgs/development/libraries/haskell/charset/default.nix +++ b/pkgs/development/libraries/haskell/charset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroups, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix index 0ef18440e37..9ad35360fe6 100644 --- a/pkgs/development/libraries/haskell/cheapskate/default.nix +++ b/pkgs/development/libraries/haskell/cheapskate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate , xssSanitize }: diff --git a/pkgs/development/libraries/haskell/checkers/default.nix b/pkgs/development/libraries/haskell/checkers/default.nix index 06b89ba85b4..fb7e86fc75f 100644 --- a/pkgs/development/libraries/haskell/checkers/default.nix +++ b/pkgs/development/libraries/haskell/checkers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix index bc5b0b4ffba..498bcaf2bf6 100644 --- a/pkgs/development/libraries/haskell/chell-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/chell-quickcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/chell/default.nix b/pkgs/development/libraries/haskell/chell/default.nix index cab43842f73..2b6c4e61bf9 100644 --- a/pkgs/development/libraries/haskell/chell/default.nix +++ b/pkgs/development/libraries/haskell/chell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, options, patience, random, text , transformers }: diff --git a/pkgs/development/libraries/haskell/chunked-data/default.nix b/pkgs/development/libraries/haskell/chunked-data/default.nix index 2705aee7aab..2db35213a1a 100644 --- a/pkgs/development/libraries/haskell/chunked-data/default.nix +++ b/pkgs/development/libraries/haskell/chunked-data/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, monoTraversable, semigroups, systemFilepath , text, transformers, vector }: diff --git a/pkgs/development/libraries/haskell/cipher-aes/default.nix b/pkgs/development/libraries/haskell/cipher-aes/default.nix index 52ec2fab711..7edfe750d37 100644 --- a/pkgs/development/libraries/haskell/cipher-aes/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "cipher-aes"; - version = "0.2.7"; - sha256 = "1a5viy2frkdqhzzlipd2ik89a04gv95v4b98lgpsas2958r9c9yp"; + version = "0.2.8"; + sha256 = "13hg8gxhs7hmni72kp14hmhvfv1kj7fnl83i72bz3aq15vx3z61z"; buildDepends = [ byteable cryptoCipherTypes securemem ]; testDepends = [ byteable cryptoCipherTests cryptoCipherTypes QuickCheck diff --git a/pkgs/development/libraries/haskell/cipher-aes128/default.nix b/pkgs/development/libraries/haskell/cipher-aes128/default.nix index 6bae5a99808..ce925361143 100644 --- a/pkgs/development/libraries/haskell/cipher-aes128/default.nix +++ b/pkgs/development/libraries/haskell/cipher-aes128/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix index 44a7d96907a..3f2619c70e8 100644 --- a/pkgs/development/libraries/haskell/cipher-blowfish/default.nix +++ b/pkgs/development/libraries/haskell/cipher-blowfish/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2, vector }: diff --git a/pkgs/development/libraries/haskell/cipher-camellia/default.nix b/pkgs/development/libraries/haskell/cipher-camellia/default.nix index 52217751d27..7e83f50568d 100644 --- a/pkgs/development/libraries/haskell/cipher-camellia/default.nix +++ b/pkgs/development/libraries/haskell/cipher-camellia/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2, vector }: diff --git a/pkgs/development/libraries/haskell/cipher-des/default.nix b/pkgs/development/libraries/haskell/cipher-des/default.nix index fdc30278425..7309586e1c6 100644 --- a/pkgs/development/libraries/haskell/cipher-des/default.nix +++ b/pkgs/development/libraries/haskell/cipher-des/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , securemem, testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/cipher-rc4/default.nix b/pkgs/development/libraries/haskell/cipher-rc4/default.nix index 6485487a0e5..4951584e395 100644 --- a/pkgs/development/libraries/haskell/cipher-rc4/default.nix +++ b/pkgs/development/libraries/haskell/cipher-rc4/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTests, cryptoCipherTypes, QuickCheck , testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/circle-packing/default.nix b/pkgs/development/libraries/haskell/circle-packing/default.nix index 8fa1eb5ca42..82ee642a9ba 100644 --- a/pkgs/development/libraries/haskell/circle-packing/default.nix +++ b/pkgs/development/libraries/haskell/circle-packing/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/citeproc-hs/default.nix b/pkgs/development/libraries/haskell/citeproc-hs/default.nix index bdc78984c7b..ddda7015e47 100644 --- a/pkgs/development/libraries/haskell/citeproc-hs/default.nix +++ b/pkgs/development/libraries/haskell/citeproc-hs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hexpat, hsBibutils, HTTP, json, mtl, network , pandocTypes, parsec, syb, time, utf8String }: diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index a5bc5316b7f..d6f67674db4 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, classyPrelude, conduit, conduitCombinators, hspec , monadControl, QuickCheck, resourcet, systemFileio, transformers , void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index 8b740ded6e7..273147fcc62 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions , hashable, hspec, liftedBase, monoTraversable, QuickCheck , semigroups, stm, systemFilepath, text, time, transformers diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix new file mode 100644 index 00000000000..8eafd67cadb --- /dev/null +++ b/pkgs/development/libraries/haskell/clay/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit, mtl, testFramework, testFrameworkHunit, text }: + +cabal.mkDerivation (self: { + pname = "clay"; + version = "0.9.0.1"; + sha256 = "1w2617kpj6rblmycqb97gyshwbvzp5w2h4xh494mvdzi3bkahqpn"; + buildDepends = [ mtl text ]; + testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; + meta = { + homepage = "http://fvisser.nl/clay"; + description = "CSS preprocessor as embedded Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index 00df46640e1..5066ad84d86 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, cereal, cipherAes, cprngAes, cryptoApi , cryptoRandom, entropy, hspec, HUnit, QuickCheck, skein, tagged , transformers diff --git a/pkgs/development/libraries/haskell/clock/default.nix b/pkgs/development/libraries/haskell/clock/default.nix index 65bfffec52e..3c064d1db2d 100644 --- a/pkgs/development/libraries/haskell/clock/default.nix +++ b/pkgs/development/libraries/haskell/clock/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cmdargs/default.nix b/pkgs/development/libraries/haskell/cmdargs/default.nix index 7678849930e..6482751a797 100644 --- a/pkgs/development/libraries/haskell/cmdargs/default.nix +++ b/pkgs/development/libraries/haskell/cmdargs/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, transformers }: cabal.mkDerivation (self: { pname = "cmdargs"; - version = "0.10.7"; - sha256 = "0mhsj27vynilpmwxgdpb3r383rksrqs9ix15zl2xbhc95a815pfl"; + version = "0.10.8"; + sha256 = "1gh6g655s5yjf55qlbpn7daw5f67j79znibs4dwrvhj985hb9a7p"; isLibrary = true; isExecutable = true; buildDepends = [ filepath transformers ]; diff --git a/pkgs/development/libraries/haskell/cmdlib/default.nix b/pkgs/development/libraries/haskell/cmdlib/default.nix index 0a71649f0e9..9263f3da099 100644 --- a/pkgs/development/libraries/haskell/cmdlib/default.nix +++ b/pkgs/development/libraries/haskell/cmdlib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, split, syb, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cmdtheline/default.nix b/pkgs/development/libraries/haskell/cmdtheline/default.nix index c49093f6859..6e38361b822 100644 --- a/pkgs/development/libraries/haskell/cmdtheline/default.nix +++ b/pkgs/development/libraries/haskell/cmdtheline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, HUnit, parsec, testFramework, testFrameworkHunit , transformers }: diff --git a/pkgs/development/libraries/haskell/code-builder/default.nix b/pkgs/development/libraries/haskell/code-builder/default.nix new file mode 100644 index 00000000000..77883f5a07a --- /dev/null +++ b/pkgs/development/libraries/haskell/code-builder/default.nix @@ -0,0 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "code-builder"; + version = "0.1.3"; + sha256 = "1ax4c19xkszahcxvwc1wa1hrgk6ajck5sbprbplsi1gc9jj4g7jm"; + meta = { + description = "Simple system for generating code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/codec-image-devil/default.nix b/pkgs/development/libraries/haskell/codec-image-devil/default.nix index 1ee26a80d0b..f1f3bd0a04b 100644 --- a/pkgs/development/libraries/haskell/codec-image-devil/default.nix +++ b/pkgs/development/libraries/haskell/codec-image-devil/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libdevil }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/colorize-haskell/default.nix b/pkgs/development/libraries/haskell/colorize-haskell/default.nix index fa2b9880123..dd46e7ef09f 100644 --- a/pkgs/development/libraries/haskell/colorize-haskell/default.nix +++ b/pkgs/development/libraries/haskell/colorize-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, haskellLexer }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix index 245ea3ef30e..2d4db2cdc4d 100644 --- a/pkgs/development/libraries/haskell/colors/default.nix +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, profunctors }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/colour/default.nix b/pkgs/development/libraries/haskell/colour/default.nix index 06bcc8ed981..c967bb65600 100644 --- a/pkgs/development/libraries/haskell/colour/default.nix +++ b/pkgs/development/libraries/haskell/colour/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/command-qq/default.nix b/pkgs/development/libraries/haskell/command-qq/default.nix new file mode 100644 index 00000000000..961506b6a81 --- /dev/null +++ b/pkgs/development/libraries/haskell/command-qq/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, hspec, text }: + +cabal.mkDerivation (self: { + pname = "command-qq"; + version = "0.3.0.0"; + sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5"; + buildDepends = [ text ]; + testDepends = [ doctest hspec text ]; + doCheck = false; + meta = { + homepage = "http://biegunka.github.io/command-qq/"; + description = "Quasiquoters for external commands"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/comonad-transformers/default.nix b/pkgs/development/libraries/haskell/comonad-transformers/default.nix index 943a0718e03..b27dc1ee6d7 100644 --- a/pkgs/development/libraries/haskell/comonad-transformers/default.nix +++ b/pkgs/development/libraries/haskell/comonad-transformers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/comonad/default.nix b/pkgs/development/libraries/haskell/comonad/default.nix index 00b970ea112..da990817544 100644 --- a/pkgs/development/libraries/haskell/comonad/default.nix +++ b/pkgs/development/libraries/haskell/comonad/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, contravariant, distributive, doctest, filepath, semigroups , tagged, transformers }: diff --git a/pkgs/development/libraries/haskell/comonads-fd/default.nix b/pkgs/development/libraries/haskell/comonads-fd/default.nix index f55123f8fe1..8c009b8b501 100644 --- a/pkgs/development/libraries/haskell/comonads-fd/default.nix +++ b/pkgs/development/libraries/haskell/comonads-fd/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/compact-string-fix/default.nix b/pkgs/development/libraries/haskell/compact-string-fix/default.nix index fb0b6a1f1cb..421bc79893d 100644 --- a/pkgs/development/libraries/haskell/compact-string-fix/default.nix +++ b/pkgs/development/libraries/haskell/compact-string-fix/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 13e6fd8a2b2..6b569858c53 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, derive, HUnit, mtl, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, thExpandSyns , transformers, treeView @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "compdata"; - version = "0.8.1.0"; - sha256 = "06bsdhf40b8111k0fmfc53i5kib9n431f07qyj83pq8isgkk33xc"; + version = "0.8.1.2"; + sha256 = "1jhfhinkn6klh68rzl5skh1rianjycc6cfkrglsi17j60a723v9x"; buildDepends = [ deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; diff --git a/pkgs/development/libraries/haskell/composition/default.nix b/pkgs/development/libraries/haskell/composition/default.nix index 0a870c5b353..bf86e11cc81 100644 --- a/pkgs/development/libraries/haskell/composition/default.nix +++ b/pkgs/development/libraries/haskell/composition/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/compressed/default.nix b/pkgs/development/libraries/haskell/compressed/default.nix index 40e82f62f69..9ef921a616f 100644 --- a/pkgs/development/libraries/haskell/compressed/default.nix +++ b/pkgs/development/libraries/haskell/compressed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, fingertree, hashable, keys, pointed, reducers , semigroupoids, semigroups, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/concatenative/default.nix b/pkgs/development/libraries/haskell/concatenative/default.nix index 34344c1566b..9762ffc5fc8 100644 --- a/pkgs/development/libraries/haskell/concatenative/default.nix +++ b/pkgs/development/libraries/haskell/concatenative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix index 20894b844ac..896496dc4a3 100644 --- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix +++ b/pkgs/development/libraries/haskell/concreteTyperep/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, hashable, QuickCheck, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 29520fddd0c..34bcfdea1a4 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, baseUnicodeSymbols, HUnit, random, stm , testFramework, testFrameworkHunit, unboundedDelays }: diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix index 58efe5dd29d..64b62db5ba8 100644 --- a/pkgs/development/libraries/haskell/cond/default.nix +++ b/pkgs/development/libraries/haskell/cond/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/conduit-combinators/default.nix b/pkgs/development/libraries/haskell/conduit-combinators/default.nix index 99ac99ebc82..c1396751f10 100644 --- a/pkgs/development/libraries/haskell/conduit-combinators/default.nix +++ b/pkgs/development/libraries/haskell/conduit-combinators/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base16Bytestring, base64Bytestring, chunkedData, conduit , conduitExtra, hspec, monadControl, monoTraversable, mwcRandom , primitive, resourcet, silently, systemFileio, systemFilepath @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "conduit-combinators"; - version = "0.2.5.2"; - sha256 = "00zvai14cgh2g9wa436kfdgyfzm3pksnhzy365y1yn96dwbbh1ih"; + version = "0.2.6.1"; + sha256 = "01q585fwfl7qw5yr7ry1zfwm0lbmizyidifk9jzxdfxppbccfxfc"; buildDepends = [ base16Bytestring base64Bytestring chunkedData conduit conduitExtra monadControl monoTraversable mwcRandom primitive resourcet diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index 084f9f38ca2..5dc139d058f 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -1,20 +1,22 @@ -{ cabal, attoparsec, blazeBuilder, conduit, exceptions, filepath -, hspec, monadControl, network, primitive, resourcet +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, attoparsec, blazeBuilder, conduit, exceptions +, filepath, hspec, monadControl, network, primitive, resourcet, stm , streamingCommons, text, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.0.4"; - sha256 = "0l1cv65p8nvvb9qgcj87a682wh9xim0rbk2xzhdkd0r123csb118"; + version = "1.1.2"; + sha256 = "1hglg491vgy6hjggi7067rjly3dlnr3byf6xlc20narzr25sxfxi"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network - primitive resourcet streamingCommons text transformers + primitive resourcet stm streamingCommons text transformers transformersBase ]; testDepends = [ - attoparsec blazeBuilder conduit exceptions hspec resourcet text - transformers transformersBase + async attoparsec blazeBuilder conduit exceptions hspec resourcet + stm text transformers transformersBase ]; noHaddock = true; meta = { diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix index 630e9610bbb..7d2375f4b36 100644 --- a/pkgs/development/libraries/haskell/conduit/default.nix +++ b/pkgs/development/libraries/haskell/conduit/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl , QuickCheck, resourcet, transformers, transformersBase, void }: cabal.mkDerivation (self: { pname = "conduit"; - version = "1.1.6"; - sha256 = "1nhjj5zz934fd6fdbmkl8xvnvlaprxccgpwxffmdgqwxhvxgprq3"; + version = "1.1.7"; + sha256 = "0xk2his7qbidnzs56xcgnjipbnqmmnh74qy8dfvbznkkqhxdzmz6"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl resourcet transformers transformersBase void diff --git a/pkgs/development/libraries/haskell/configurator/default.nix b/pkgs/development/libraries/haskell/configurator/default.nix index 775c2e5027f..3ea53f686c9 100644 --- a/pkgs/development/libraries/haskell/configurator/default.nix +++ b/pkgs/development/libraries/haskell/configurator/default.nix @@ -1,14 +1,19 @@ -{ cabal, attoparsec, hashable, text, unixCompat -, unorderedContainers +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, filepath, hashable, HUnit, testFramework +, testFrameworkHunit, text, unixCompat, unorderedContainers }: cabal.mkDerivation (self: { pname = "configurator"; - version = "0.2.0.2"; - sha256 = "011rgd48gv4idkh2dwg4mlyx3s6pgm1263xq5ixsa4sg3jqh9d8b"; + version = "0.3.0.0"; + sha256 = "1d1iq1knwiq6ia5g64rw5hqm6dakz912qj13r89737rfcxmrkfbf"; buildDepends = [ attoparsec hashable text unixCompat unorderedContainers ]; + testDepends = [ + filepath HUnit testFramework testFrameworkHunit text + ]; meta = { homepage = "http://github.com/bos/configurator"; description = "Configuration management"; diff --git a/pkgs/development/libraries/haskell/connection/default.nix b/pkgs/development/libraries/haskell/connection/default.nix index 4a2c8ff7792..8b2380767f3 100644 --- a/pkgs/development/libraries/haskell/connection/default.nix +++ b/pkgs/development/libraries/haskell/connection/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cprngAes, dataDefaultClass, network, socks, tls, x509 , x509Store, x509System, x509Validation }: cabal.mkDerivation (self: { pname = "connection"; - version = "0.2.1"; - sha256 = "1wdjfc9lld3wkr7ncjkszmrwqp74p994ml3chymniz440xg1lxwy"; + version = "0.2.3"; + sha256 = "02mqn19pssdak82jw38p3cbwjyfvmjc6fawgx5981hzbdgb64vsb"; buildDepends = [ cprngAes dataDefaultClass network socks tls x509 x509Store x509System x509Validation diff --git a/pkgs/development/libraries/haskell/constraints/default.nix b/pkgs/development/libraries/haskell/constraints/default.nix index 333d8e6601d..4ca94f8d2f2 100644 --- a/pkgs/development/libraries/haskell/constraints/default.nix +++ b/pkgs/development/libraries/haskell/constraints/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, newtype }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/continued-fractions/default.nix b/pkgs/development/libraries/haskell/continued-fractions/default.nix index 095d0a17984..45c92acc068 100644 --- a/pkgs/development/libraries/haskell/continued-fractions/default.nix +++ b/pkgs/development/libraries/haskell/continued-fractions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/contravariant/default.nix b/pkgs/development/libraries/haskell/contravariant/default.nix index f1372d7630b..b3c549ecef8 100644 --- a/pkgs/development/libraries/haskell/contravariant/default.nix +++ b/pkgs/development/libraries/haskell/contravariant/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/control-bool/default.nix b/pkgs/development/libraries/haskell/control-bool/default.nix index 4fe9a975f41..12f9b287d1b 100644 --- a/pkgs/development/libraries/haskell/control-bool/default.nix +++ b/pkgs/development/libraries/haskell/control-bool/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/control-monad-free/default.nix b/pkgs/development/libraries/haskell/control-monad-free/default.nix index 93fed5fae06..e2768a9cf55 100644 --- a/pkgs/development/libraries/haskell/control-monad-free/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/control-monad-loop/default.nix b/pkgs/development/libraries/haskell/control-monad-loop/default.nix index 561564093b9..40d7e5a1e33 100644 --- a/pkgs/development/libraries/haskell/control-monad-loop/default.nix +++ b/pkgs/development/libraries/haskell/control-monad-loop/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers, transformersBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/converge/default.nix b/pkgs/development/libraries/haskell/converge/default.nix index 50d95cb8851..83302876e44 100644 --- a/pkgs/development/libraries/haskell/converge/default.nix +++ b/pkgs/development/libraries/haskell/converge/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix index 8a79e50527d..cf65b0f936c 100644 --- a/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix +++ b/pkgs/development/libraries/haskell/convertible/1.0.11.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix index 78be057c201..ea8091426ee 100644 --- a/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/convertible/1.1.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cookie/default.nix b/pkgs/development/libraries/haskell/cookie/default.nix index 423cf4c156b..6a35f3d5523 100644 --- a/pkgs/development/libraries/haskell/cookie/default.nix +++ b/pkgs/development/libraries/haskell/cookie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, dataDefault, deepseq, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/coroutine-object/default.nix b/pkgs/development/libraries/haskell/coroutine-object/default.nix index ea316fd29e1..63448e3a633 100644 --- a/pkgs/development/libraries/haskell/coroutine-object/default.nix +++ b/pkgs/development/libraries/haskell/coroutine-object/default.nix @@ -1,15 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, either, lens, mtl, safecopy, transformers , transformersFree, uuid }: cabal.mkDerivation (self: { pname = "coroutine-object"; - version = "0.2.0.0"; - sha256 = "1jl5glnk4ildjrxyxscxd0v7xfqbd9vpv5gaxygsfsbfr1zizp3s"; + version = "0.3"; + sha256 = "0q0rvcc7ipxwmikaxh0ymq1d65f2q1a2jrd1i553pdf8hwmv0k1r"; buildDepends = [ cereal either lens mtl safecopy transformers transformersFree uuid ]; - jailbreak = true; meta = { description = "Object-oriented programming realization using coroutine"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/cprng-aes/default.nix b/pkgs/development/libraries/haskell/cprng-aes/default.nix index 9425ec37547..de3b33a0709 100644 --- a/pkgs/development/libraries/haskell/cprng-aes/default.nix +++ b/pkgs/development/libraries/haskell/cprng-aes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cipherAes, cryptoRandom, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cpu/default.nix b/pkgs/development/libraries/haskell/cpu/default.nix index 3d8ba2784f5..5a8d7021765 100644 --- a/pkgs/development/libraries/haskell/cpu/default.nix +++ b/pkgs/development/libraries/haskell/cpu/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/criterion/default.nix b/pkgs/development/libraries/haskell/criterion/default.nix index f1965012946..35d6d74c73c 100644 --- a/pkgs/development/libraries/haskell/criterion/default.nix +++ b/pkgs/development/libraries/haskell/criterion/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, binary, deepseq, filepath, Glob, hastache, mtl , mwcRandom, parsec, statistics, text, time, transformers, vector , vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/crypto-api/default.nix b/pkgs/development/libraries/haskell/crypto-api/default.nix index 5741d4b3c2e..10bcb3d16b0 100644 --- a/pkgs/development/libraries/haskell/crypto-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-api/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, entropy, tagged, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix index 3c514936468..04b1b191878 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck , securemem, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix index 8f52f724bcd..63431431bf7 100644 --- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, securemem }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-conduit/default.nix b/pkgs/development/libraries/haskell/crypto-conduit/default.nix index bcc357fbed3..63f6f119e5d 100644 --- a/pkgs/development/libraries/haskell/crypto-conduit/default.nix +++ b/pkgs/development/libraries/haskell/crypto-conduit/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, conduit, conduitExtra, cryptoApi, cryptocipher , cryptohashCryptoapi, hspec, resourcet, skein, transformers }: cabal.mkDerivation (self: { pname = "crypto-conduit"; - version = "0.5.3"; - sha256 = "1xvjfkwd4rqlgyz172s2mihfqz1pac84qhc72c4zw1nwadsh6dgl"; + version = "0.5.4"; + sha256 = "1z628gj4sf50s7pd6p41c670rz98f8b6p3n2dvl93haczcg53l1n"; buildDepends = [ cereal conduit conduitExtra cryptoApi resourcet transformers ]; @@ -16,7 +18,7 @@ cabal.mkDerivation (self: { jailbreak = true; doCheck = false; meta = { - homepage = "https://github.com/meteficha/crypto-conduit"; + homepage = "https://github.com/prowdsponsor/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/crypto-numbers/default.nix b/pkgs/development/libraries/haskell/crypto-numbers/default.nix index b3f0b205af5..d101d9af197 100644 --- a/pkgs/development/libraries/haskell/crypto-numbers/default.nix +++ b/pkgs/development/libraries/haskell/crypto-numbers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptoRandom, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector }: diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index 264c420842a..e8eeed95aec 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Types }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index b321c231bb4..bd4b4f9639f 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, cryptohash, cryptoNumbers, cryptoPubkeyTypes , cryptoRandom, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/crypto-random-api/default.nix b/pkgs/development/libraries/haskell/crypto-random-api/default.nix index 7c3b10a3838..674c2e87013 100644 --- a/pkgs/development/libraries/haskell/crypto-random-api/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random-api/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, entropy }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/crypto-random/default.nix b/pkgs/development/libraries/haskell/crypto-random/default.nix index 1b5e2aa3238..878eb3d2c71 100644 --- a/pkgs/development/libraries/haskell/crypto-random/default.nix +++ b/pkgs/development/libraries/haskell/crypto-random/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, securemem, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cryptocipher/default.nix b/pkgs/development/libraries/haskell/cryptocipher/default.nix index 7d3ddf57e52..29d2dd1b31d 100644 --- a/pkgs/development/libraries/haskell/cryptocipher/default.nix +++ b/pkgs/development/libraries/haskell/cryptocipher/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cipherAes, cipherBlowfish, cipherCamellia, cipherDes , cipherRc4, cryptoCipherTypes }: diff --git a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix index 78c0c101659..c9476bae647 100644 --- a/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, cryptohash, resourcet, transformers }: diff --git a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix index 020b34298ad..a1ff03e4c49 100644 --- a/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash-cryptoapi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cryptoApi, cryptohash, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cryptohash/default.nix b/pkgs/development/libraries/haskell/cryptohash/default.nix index 894d317336d..a1d6b32411c 100644 --- a/pkgs/development/libraries/haskell/cryptohash/default.nix +++ b/pkgs/development/libraries/haskell/cryptohash/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable, HUnit, QuickCheck, tasty, tastyHunit , tastyQuickcheck }: cabal.mkDerivation (self: { pname = "cryptohash"; - version = "0.11.5"; - sha256 = "0vxnwnjch2r9d54q5f5bfz60npjc7s7x6a5233md7fa756822b9d"; + version = "0.11.6"; + sha256 = "0dyzcaxr8vhzqq9hj4240rxpi87h4ps87yz09klz723shls26f6s"; buildDepends = [ byteable ]; testDepends = [ byteable HUnit QuickCheck tasty tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/haskell/css-text/default.nix b/pkgs/development/libraries/haskell/css-text/default.nix index 9ab9b9f5d2d..ea5e823f14e 100644 --- a/pkgs/development/libraries/haskell/css-text/default.nix +++ b/pkgs/development/libraries/haskell/css-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, hspec, QuickCheck, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/csv/default.nix b/pkgs/development/libraries/haskell/csv/default.nix index f56a9b89423..70c469cdb1b 100644 --- a/pkgs/development/libraries/haskell/csv/default.nix +++ b/pkgs/development/libraries/haskell/csv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 71825f5fbd6..3abc6443c6e 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, cudatoolkit, nvidia_x11 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index ec23761003c..d24af97f4f2 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, cuda }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/curl/default.nix b/pkgs/development/libraries/haskell/curl/default.nix index a530044ca6e..39a72e3fe97 100644 --- a/pkgs/development/libraries/haskell/curl/default.nix +++ b/pkgs/development/libraries/haskell/curl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, curl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix index ce550d02beb..2f514295786 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-mtl.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, mtl }: cabal.mkDerivation (self: { pname = "data-accessor-mtl"; - version = "0.2.0.3"; - sha256 = "1aksmm4ykb96khgq5y4vd40zbn4c73hgl21xvyc295cwxsyrbvbk"; + version = "0.2.0.4"; + sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh"; buildDepends = [ dataAccessor mtl ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix index 89658ead4d5..9a6fd160ca8 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-template.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, utilityHt }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix index 83712b858c2..c25d8d98cb9 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor-transformers.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, transformers }: cabal.mkDerivation (self: { pname = "data-accessor-transformers"; - version = "0.2.1.4"; - sha256 = "1bf1j8g5q81zw51bri89hj3i9jnlmhdggw8rhw3n2v103399pf7d"; + version = "0.2.1.6"; + sha256 = "1iawhp1h68ynr2axj12jrn47nf08mss0ar8blagp59yi8j7170fa"; buildDepends = [ dataAccessor transformers ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Record_access"; diff --git a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix index 5f6dff99dd2..4ea654e1eb5 100644 --- a/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix +++ b/pkgs/development/libraries/haskell/data-accessor/data-accessor.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { pname = "data-accessor"; - version = "0.2.2.5"; - sha256 = "0z63fv41cnpk3h404gprk2f5jl7rrpyv97xmsgac9zgdm5zkkhm6"; + version = "0.2.2.6"; + sha256 = "0668qgllmp2911ppsb0g9z95nq2x0h2cvzyyjlb6iwhnjzyyg7gf"; buildDepends = [ transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix index db9b90574e4..730bf84abb1 100644 --- a/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix +++ b/pkgs/development/libraries/haskell/data-binary-ieee754/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-checked/default.nix b/pkgs/development/libraries/haskell/data-checked/default.nix index 429f9da92bf..790e22d5cfa 100644 --- a/pkgs/development/libraries/haskell/data-checked/default.nix +++ b/pkgs/development/libraries/haskell/data-checked/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-class/default.nix b/pkgs/development/libraries/haskell/data-default-class/default.nix index 1db4468a6de..646f73a2aa9 100644 --- a/pkgs/development/libraries/haskell/data-default-class/default.nix +++ b/pkgs/development/libraries/haskell/data-default-class/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix index 5fc59b232a4..992a5e012dd 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-base/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix index 6ac626b7079..49752fd5055 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-containers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix index a89da0c84f5..753d91b8a4d 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-dlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, dlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix index b1b7742692a..0da8199f3ae 100644 --- a/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix +++ b/pkgs/development/libraries/haskell/data-default-instances-old-locale/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-default/default.nix b/pkgs/development/libraries/haskell/data-default/default.nix index e4340c7ec32..77d7d336fe5 100644 --- a/pkgs/development/libraries/haskell/data-default/default.nix +++ b/pkgs/development/libraries/haskell/data-default/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, dataDefaultInstancesBase , dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesOldLocale diff --git a/pkgs/development/libraries/haskell/data-fix/default.nix b/pkgs/development/libraries/haskell/data-fix/default.nix new file mode 100644 index 00000000000..ab029a7d1c9 --- /dev/null +++ b/pkgs/development/libraries/haskell/data-fix/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "data-fix"; + version = "0.0.1"; + sha256 = "09r08lrv92ka6p35wkbfhq9ywg7y5pmgszwbz8a20h31vjz1ffpr"; + meta = { + homepage = "https://github.com/anton-k/data-fix"; + description = "Fixpoint data types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/data-hash/default.nix b/pkgs/development/libraries/haskell/data-hash/default.nix index c8e4887063c..a2c6adeedf9 100644 --- a/pkgs/development/libraries/haskell/data-hash/default.nix +++ b/pkgs/development/libraries/haskell/data-hash/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-inttrie/default.nix b/pkgs/development/libraries/haskell/data-inttrie/default.nix index ec3cf7ca649..09cd0cb75d8 100644 --- a/pkgs/development/libraries/haskell/data-inttrie/default.nix +++ b/pkgs/development/libraries/haskell/data-inttrie/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index 14614b8ab00..2eca446c714 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { pname = "data-lens-light"; - version = "0.1.1"; - sha256 = "03nsfwpcl7wmw2bgcb8z3w04krlbrbks7bjpnzfdz6cgdr5mnjrs"; + version = "0.1.2"; + sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7"; buildDepends = [ mtl ]; meta = { homepage = "https://github.com/feuerbach/data-lens-light"; diff --git a/pkgs/development/libraries/haskell/data-lens-template/default.nix b/pkgs/development/libraries/haskell/data-lens-template/default.nix index 67bd753b302..d167e8051cd 100644 --- a/pkgs/development/libraries/haskell/data-lens-template/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataLens }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-lens/default.nix b/pkgs/development/libraries/haskell/data-lens/default.nix index 24755738fdb..a880db50a16 100644 --- a/pkgs/development/libraries/haskell/data-lens/default.nix +++ b/pkgs/development/libraries/haskell/data-lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, semigroupoids, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-memocombinators/default.nix b/pkgs/development/libraries/haskell/data-memocombinators/default.nix index 3bdaf941c83..a53e093a85c 100644 --- a/pkgs/development/libraries/haskell/data-memocombinators/default.nix +++ b/pkgs/development/libraries/haskell/data-memocombinators/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataInttrie }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix index 1de08938680..959eb57e779 100644 --- a/pkgs/development/libraries/haskell/data-ordlist/default.nix +++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-pprint/default.nix b/pkgs/development/libraries/haskell/data-pprint/default.nix index 08202a26b71..d082cbae510 100644 --- a/pkgs/development/libraries/haskell/data-pprint/default.nix +++ b/pkgs/development/libraries/haskell/data-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, mtl, parallel, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/data-reify/default.nix b/pkgs/development/libraries/haskell/data-reify/default.nix index 6599d25f68e..666b92dbdb5 100644 --- a/pkgs/development/libraries/haskell/data-reify/default.nix +++ b/pkgs/development/libraries/haskell/data-reify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dataenc/default.nix b/pkgs/development/libraries/haskell/dataenc/default.nix index 8c7303776f8..190baa10163 100644 --- a/pkgs/development/libraries/haskell/dataenc/default.nix +++ b/pkgs/development/libraries/haskell/dataenc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/date-cache/default.nix b/pkgs/development/libraries/haskell/date-cache/default.nix index a460dcbdafc..bacf480a262 100644 --- a/pkgs/development/libraries/haskell/date-cache/default.nix +++ b/pkgs/development/libraries/haskell/date-cache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/datetime/default.nix b/pkgs/development/libraries/haskell/datetime/default.nix index faf0b40b94d..d2ed2532d23 100644 --- a/pkgs/development/libraries/haskell/datetime/default.nix +++ b/pkgs/development/libraries/haskell/datetime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dbmigrations/default.nix b/pkgs/development/libraries/haskell/dbmigrations/default.nix index f8efb953799..e142d7b3172 100644 --- a/pkgs/development/libraries/haskell/dbmigrations/default.nix +++ b/pkgs/development/libraries/haskell/dbmigrations/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, configurator, fgl, filepath, HDBC, HDBCPostgresql , HDBCSqlite3, HUnit, mtl, random, text, time, yamlLight }: diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index d2700195b10..81aee9c42b4 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, chell, chellQuickcheck, filepath, libxmlSax , network, parsec, QuickCheck, random, text, transformers, vector , xmlTypes diff --git a/pkgs/development/libraries/haskell/deepseq-generics/default.nix b/pkgs/development/libraries/haskell/deepseq-generics/default.nix new file mode 100644 index 00000000000..0ee12f4b465 --- /dev/null +++ b/pkgs/development/libraries/haskell/deepseq-generics/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, HUnit, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "deepseq-generics"; + version = "0.1.1.1"; + sha256 = "1icc2gxsbnjjl150msnyysvr9r14kb6s2gm3izrj5a3mwf6l7s08"; + buildDepends = [ deepseq ]; + testDepends = [ deepseq HUnit testFramework testFrameworkHunit ]; + meta = { + homepage = "https://github.com/hvr/deepseq-generics"; + description = "GHC.Generics-based Control.DeepSeq.rnf implementation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index 228fcd28c78..efa3057291d 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { @@ -6,6 +8,8 @@ cabal.mkDerivation (self: { sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965"; buildDepends = [ deepseq ]; testDepends = [ deepseq ]; + jailbreak = true; + doCheck = false; meta = { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix index c13abe9e31c..bc49aafd5cf 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix index 99db69e612a..e30a2e35cde 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.1.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix index f4ef61cbbff..7a2d61de069 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix index 3c6ce781dc2..1dd3e7f09ba 100644 --- a/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix +++ b/pkgs/development/libraries/haskell/deepseq/1.3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dependent-map/default.nix b/pkgs/development/libraries/haskell/dependent-map/default.nix index f8af7c8e42e..0270139c383 100644 --- a/pkgs/development/libraries/haskell/dependent-map/default.nix +++ b/pkgs/development/libraries/haskell/dependent-map/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dependentSum }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix index 2ea45097d3f..614a3fdf72d 100644 --- a/pkgs/development/libraries/haskell/dependent-sum-template/default.nix +++ b/pkgs/development/libraries/haskell/dependent-sum-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dependentSum, thExtras }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dependent-sum/default.nix b/pkgs/development/libraries/haskell/dependent-sum/default.nix index a92dd8064da..9f0922a8dfa 100644 --- a/pkgs/development/libraries/haskell/dependent-sum/default.nix +++ b/pkgs/development/libraries/haskell/dependent-sum/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "dependent-sum"; - version = "0.2.0.2"; - sha256 = "06amnc50j246f2za0ri49j6vyq6admx03w3xxjhhfnfx9lp6zmhm"; + version = "0.2.1.0"; + sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3"; meta = { homepage = "https://github.com/mokus0/dependent-sum"; description = "Dependent sum type"; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 5dba1b6af56..eb1b1ce3162 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, syb, transformers, uniplate }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix index ca702b60356..668ea96abbb 100644 --- a/pkgs/development/libraries/haskell/derp/default.nix +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 33e27cd9ff8..da842c656e1 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, colour, dataDefaultClass, diagramsCore, diagramsLib , filepath, hashable, JuicyPixels, lens, mtl, optparseApplicative , pango, split, statestack, time, transformers, vector diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a433284ef7a..2dcc86d5c9b 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, arithmoi, circlePacking, colour, dataDefault , dataDefaultClass, diagramsCore, diagramsLib, forceLayout, HUnit , lens, MonadRandom, mtl, parsec, QuickCheck, semigroups, split diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 153f109d14b..9a1245d04d0 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dualTree, lens, MemoTrie, monoidExtras, newtype , semigroups, vectorSpace, vectorSpacePoints }: diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix index 5f94e2922a1..268bdce4279 100644 --- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix +++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, diagramsContrib, diagramsCore, diagramsLib, diagramsSvg }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 03d6ad9f396..77047d98291 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, active, colour, dataDefaultClass, diagramsCore, dualTree , filepath, fingertree, hashable, intervals, JuicyPixels, lens , MemoTrie, monoidExtras, optparseApplicative, safe, semigroups diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 29dbafb890f..1ded949e7ce 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, diagramsCore, diagramsLib, dlist , filepath, hashable, lens, monoidExtras, mtl, semigroups, split , vectorSpace diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index dbc148abaee..f982f427863 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeMarkup, blazeSvg, colour , diagramsCore, diagramsLib, filepath, hashable, JuicyPixels, lens , monoidExtras, mtl, split, time, vectorSpace diff --git a/pkgs/development/libraries/haskell/dice/default.nix b/pkgs/development/libraries/haskell/dice/default.nix index 23d3339d348..1e3b448f449 100644 --- a/pkgs/development/libraries/haskell/dice/default.nix +++ b/pkgs/development/libraries/haskell/dice/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec, randomFu, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/diff3/default.nix b/pkgs/development/libraries/haskell/diff3/default.nix index 60f27e89d58..f010f1a194a 100644 --- a/pkgs/development/libraries/haskell/diff3/default.nix +++ b/pkgs/development/libraries/haskell/diff3/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Diff, QuickCheck, testFramework, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/digest/default.nix b/pkgs/development/libraries/haskell/digest/default.nix index c315c0813eb..523c2e91c5b 100644 --- a/pkgs/development/libraries/haskell/digest/default.nix +++ b/pkgs/development/libraries/haskell/digest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index b6a5ae78f82..2613899d597 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe , scientific, tasty, tastyHunit, text, vector }: cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.8"; - sha256 = "0qvzr9s0vzgzh7mix6ncjn731krln9w47zrqb5jkj92rv7mf5sgz"; + version = "1.1.10"; + sha256 = "0ar165rksnj09sb58qx5hm71kn8gzm936ixmfhf7sqbw2kcbw4nx"; buildDepends = [ aeson digestiveFunctors lens safe text vector ]; testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 86a6a8560fb..aae120d5681 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, digestiveFunctors, heist, mtl, text, xmlhtml }: diff --git a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix index 4c678da12b9..e5a3e0a44c6 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-snap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, digestiveFunctors, filepath, mtl, snapCore, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/digestive-functors/default.nix b/pkgs/development/libraries/haskell/digestive-functors/default.nix index 8764f3e2b6c..03448a3fe67 100644 --- a/pkgs/development/libraries/haskell/digestive-functors/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, text, time }: diff --git a/pkgs/development/libraries/haskell/digits/default.nix b/pkgs/development/libraries/haskell/digits/default.nix index 3c7c08cd296..988c0016f51 100644 --- a/pkgs/development/libraries/haskell/digits/default.nix +++ b/pkgs/development/libraries/haskell/digits/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dimensional-tf/default.nix b/pkgs/development/libraries/haskell/dimensional-tf/default.nix index 4b7117a0e4c..c93a564c3e3 100644 --- a/pkgs/development/libraries/haskell/dimensional-tf/default.nix +++ b/pkgs/development/libraries/haskell/dimensional-tf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, numtypeTf, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dimensional/default.nix b/pkgs/development/libraries/haskell/dimensional/default.nix index f3444703c3d..1450b7706ca 100644 --- a/pkgs/development/libraries/haskell/dimensional/default.nix +++ b/pkgs/development/libraries/haskell/dimensional/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, numtype, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/direct-sqlite/default.nix b/pkgs/development/libraries/haskell/direct-sqlite/default.nix index 5d4adbc60df..07eca858972 100644 --- a/pkgs/development/libraries/haskell/direct-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/direct-sqlite/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base16Bytestring, HUnit, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/directory-tree/default.nix b/pkgs/development/libraries/haskell/directory-tree/default.nix index 343aeb014ad..6a338274180 100644 --- a/pkgs/development/libraries/haskell/directory-tree/default.nix +++ b/pkgs/development/libraries/haskell/directory-tree/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix new file mode 100644 index 00000000000..e4a02faa60f --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, dataAccessor, deepseq, distributedStatic, hashable +, mtl, networkTransport, random, rank1dynamic, stm, syb, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process"; + version = "0.5.0"; + sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny"; + buildDepends = [ + binary dataAccessor deepseq distributedStatic hashable mtl + networkTransport random rank1dynamic stm syb time transformers + ]; + meta = { + homepage = "http://haskell-distributed.github.com/"; + description = "Cloud Haskell: Erlang-style concurrency in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 9147b724ba2..f1003927f38 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -1,12 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, rank1dynamic }: cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.2.1.1"; - sha256 = "08y9554x6avjwdmbf33fw1pw1wl8qmgfngmgb6vgad88krnixq1h"; + version = "0.3.0.0"; + sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj"; buildDepends = [ binary rank1dynamic ]; meta = { - homepage = "http://www.github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Compositional, type-safe, polymorphic static values and closures"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/distributive/default.nix b/pkgs/development/libraries/haskell/distributive/default.nix index 10f763ffa83..9bb64ee4c59 100644 --- a/pkgs/development/libraries/haskell/distributive/default.nix +++ b/pkgs/development/libraries/haskell/distributive/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, filepath, tagged, transformers , transformersCompat }: diff --git a/pkgs/development/libraries/haskell/djinn/default.nix b/pkgs/development/libraries/haskell/djinn/default.nix index 6e8a52bb78b..fbe450df19a 100644 --- a/pkgs/development/libraries/haskell/djinn/default.nix +++ b/pkgs/development/libraries/haskell/djinn/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskeline, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dlist-instances/default.nix b/pkgs/development/libraries/haskell/dlist-instances/default.nix index d168c4b3583..29910a22381 100644 --- a/pkgs/development/libraries/haskell/dlist-instances/default.nix +++ b/pkgs/development/libraries/haskell/dlist-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dlist/default.nix b/pkgs/development/libraries/haskell/dlist/default.nix index bf63239dd81..69e95efa704 100644 --- a/pkgs/development/libraries/haskell/dlist/default.nix +++ b/pkgs/development/libraries/haskell/dlist/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, QuickCheck }: cabal.mkDerivation (self: { pname = "dlist"; - version = "0.7.0.1"; - sha256 = "197k608ja69xc531r7h3gmy1mf6dsk27b3mkpgp4zdw46z6lcb5l"; + version = "0.7.1"; + sha256 = "13ka30bn742ldacfgj2lhxvhwf769d0ziy2358vmd5xaq6fn1xfr"; buildDepends = [ deepseq ]; testDepends = [ Cabal QuickCheck ]; meta = { diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index d563348c371..8da6475cfb6 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, binary, blazeBuilder, conduit, conduitExtra , doctest, hspec, iproute, mtl, network, random, resourcet }: cabal.mkDerivation (self: { pname = "dns"; - version = "1.3.0"; - sha256 = "1zd639d69ha3g1yz7ssvwarwiwyi975ps4i5y8vrarcq2jnnsb6n"; + version = "1.4.0"; + sha256 = "1r004wpq0z98f6n3rqqlkqmb799sdldj5087icksi6rxxr3plrs9"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet diff --git a/pkgs/development/libraries/haskell/doctest-prop/default.nix b/pkgs/development/libraries/haskell/doctest-prop/default.nix index 05376ee6bbc..bca82f78bcf 100644 --- a/pkgs/development/libraries/haskell/doctest-prop/default.nix +++ b/pkgs/development/libraries/haskell/doctest-prop/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index ad7bcfe6240..018fac06670 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseCompat, deepseq, filepath, ghcPaths, hspec, HUnit , QuickCheck, setenv, silently, stringbuilder, syb, transformers }: diff --git a/pkgs/development/libraries/haskell/dotgen/default.nix b/pkgs/development/libraries/haskell/dotgen/default.nix index a7fe5b791f0..5e1037c4c5f 100644 --- a/pkgs/development/libraries/haskell/dotgen/default.nix +++ b/pkgs/development/libraries/haskell/dotgen/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/double-conversion/default.nix b/pkgs/development/libraries/haskell/double-conversion/default.nix index cad61e52ee0..6d8bdee480f 100644 --- a/pkgs/development/libraries/haskell/double-conversion/default.nix +++ b/pkgs/development/libraries/haskell/double-conversion/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, testFramework, testFrameworkQuickcheck2, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/download-curl/default.nix b/pkgs/development/libraries/haskell/download-curl/default.nix index 6b9f1e2108b..054491704a3 100644 --- a/pkgs/development/libraries/haskell/download-curl/default.nix +++ b/pkgs/development/libraries/haskell/download-curl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, curl, feed, tagsoup, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/download/default.nix b/pkgs/development/libraries/haskell/download/default.nix index 06c34bf9acb..3428e8ea362 100644 --- a/pkgs/development/libraries/haskell/download/default.nix +++ b/pkgs/development/libraries/haskell/download/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, feed, tagsoup, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dsp/default.nix b/pkgs/development/libraries/haskell/dsp/default.nix index c16a6888b6b..9b038d047f9 100644 --- a/pkgs/development/libraries/haskell/dsp/default.nix +++ b/pkgs/development/libraries/haskell/dsp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dstring/default.nix b/pkgs/development/libraries/haskell/dstring/default.nix index 4b5dd2b3888..ee4cc6b48a4 100644 --- a/pkgs/development/libraries/haskell/dstring/default.nix +++ b/pkgs/development/libraries/haskell/dstring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, dlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index 2f47a96b853..f9cf3b13b41 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monoidExtras, newtype, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix index c2ecb09824f..18dd0e2b825 100644 --- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix +++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, doctest, filepath, ghcPaths, haskellGenerate , haskellSrcExts, HUnit, tasty, tastyHunit, tastyTh, time, void }: diff --git a/pkgs/development/libraries/haskell/dyre/default.nix b/pkgs/development/libraries/haskell/dyre/default.nix index 178f01952ea..0d47a68d06d 100644 --- a/pkgs/development/libraries/haskell/dyre/default.nix +++ b/pkgs/development/libraries/haskell/dyre/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, executablePath, filepath, ghcPaths, ioStorage , time, xdgBasedir }: diff --git a/pkgs/development/libraries/haskell/edit-distance/default.nix b/pkgs/development/libraries/haskell/edit-distance/default.nix index 22f5953b7e0..b1ee00fd7a7 100644 --- a/pkgs/development/libraries/haskell/edit-distance/default.nix +++ b/pkgs/development/libraries/haskell/edit-distance/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix index 7e6262423c6..55b1e685d6d 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libedit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix index cf9f1e099a2..efb41f546b2 100644 --- a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/editline/0.2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libedit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index e7bbb47a47f..6d55afd41d6 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, free, monadControl, MonadRandom, mtl , semigroupoids, semigroups, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/ekg-carbon/default.nix b/pkgs/development/libraries/haskell/ekg-carbon/default.nix new file mode 100644 index 00000000000..e69e6a5ae4a --- /dev/null +++ b/pkgs/development/libraries/haskell/ekg-carbon/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ekgCore, network, networkCarbon, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "ekg-carbon"; + version = "1.0.1"; + sha256 = "1slaykn1a6f09dzn78v2aqw8snmidycvaw5cfyr4f0ndd88vi77d"; + buildDepends = [ + ekgCore network networkCarbon text time unorderedContainers vector + ]; + meta = { + homepage = "http://github.com/ocharles/ekg-carbon"; + description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/ekg-core/default.nix b/pkgs/development/libraries/haskell/ekg-core/default.nix index 759a6040746..2bdf088aea3 100644 --- a/pkgs/development/libraries/haskell/ekg-core/default.nix +++ b/pkgs/development/libraries/haskell/ekg-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index 3f564a72a0a..beb92ef51fe 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, ekgCore, filepath, network, snapCore, snapServer , text, time, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.0"; - sha256 = "1w448w17yp80zmb27yl90k3gz0nx3wxj52488lclmiapr6q4fgp8"; + version = "0.4.0.1"; + sha256 = "09pjsd9jr91whdhv36fkb36ivvvcr415g90a798i86vl8mklgnyx"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix index 8ba4687d3e3..ff6e4819283 100644 --- a/pkgs/development/libraries/haskell/elerea/default.nix +++ b/pkgs/development/libraries/haskell/elerea/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/email-validate/default.nix b/pkgs/development/libraries/haskell/email-validate/default.nix index a1b09433782..793184e2101 100644 --- a/pkgs/development/libraries/haskell/email-validate/default.nix +++ b/pkgs/development/libraries/haskell/email-validate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix index 5def0b895f0..3470aab9b2b 100644 --- a/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix +++ b/pkgs/development/libraries/haskell/enclosed-exceptions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, deepseq, hspec, liftedBase, monadControl , QuickCheck, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/encoding/default.nix b/pkgs/development/libraries/haskell/encoding/default.nix index d9f8710f7c5..5ec0f1502c3 100644 --- a/pkgs/development/libraries/haskell/encoding/default.nix +++ b/pkgs/development/libraries/haskell/encoding/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, extensibleExceptions, HaXml, mtl, regexCompat }: cabal.mkDerivation (self: { pname = "encoding"; - version = "0.7.0.1"; - sha256 = "18s6cfcjwjx5dja14rf35rx71cbpr8ylg4x29ffx2blsk8ib9zxh"; + version = "0.7.0.2"; + sha256 = "14l3dx7ayvp2dm37c3h7p63zfzmhwpx1hirbkm04idhi3906lxps"; buildDepends = [ binary extensibleExceptions HaXml mtl regexCompat ]; diff --git a/pkgs/development/libraries/haskell/engine-io-snap/default.nix b/pkgs/development/libraries/haskell/engine-io-snap/default.nix new file mode 100644 index 00000000000..996b8ace982 --- /dev/null +++ b/pkgs/development/libraries/haskell/engine-io-snap/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsecEnumerator, engineIo, snapCore +, unorderedContainers, websockets, websocketsSnap +}: + +cabal.mkDerivation (self: { + pname = "engine-io-snap"; + version = "1.0.1"; + sha256 = "1hw3gmi23fdcgvz817b95bf23wa7qyg10axsnvan5qxr73pwp5iv"; + buildDepends = [ + attoparsecEnumerator engineIo snapCore unorderedContainers + websockets websocketsSnap + ]; + meta = { + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix new file mode 100644 index 00000000000..fd21d94cdf7 --- /dev/null +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, async, attoparsec, base64Bytestring, either +, monadLoops, mwcRandom, stm, text, transformers +, unorderedContainers, vector, websockets +}: + +cabal.mkDerivation (self: { + pname = "engine-io"; + version = "1.1.0"; + sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh"; + buildDepends = [ + aeson async attoparsec base64Bytestring either monadLoops mwcRandom + stm text transformers unorderedContainers vector websockets + ]; + meta = { + homepage = "http://github.com/ocharles/engine.io"; + description = "A Haskell implementation of Engine.IO"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/entropy/default.nix b/pkgs/development/libraries/haskell/entropy/default.nix index 5c494f4a45d..46020b7c911 100644 --- a/pkgs/development/libraries/haskell/entropy/default.nix +++ b/pkgs/development/libraries/haskell/entropy/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enumerator/default.nix b/pkgs/development/libraries/haskell/enumerator/default.nix index 4dfa4e573dd..1418274271f 100644 --- a/pkgs/development/libraries/haskell/enumerator/default.nix +++ b/pkgs/development/libraries/haskell/enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enummapset-th/default.nix b/pkgs/development/libraries/haskell/enummapset-th/default.nix index a675d4d74ea..9b24980b5b9 100644 --- a/pkgs/development/libraries/haskell/enummapset-th/default.nix +++ b/pkgs/development/libraries/haskell/enummapset-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enummapset/default.nix b/pkgs/development/libraries/haskell/enummapset/default.nix index 2bd953e65e8..d5a0249e528 100644 --- a/pkgs/development/libraries/haskell/enummapset/default.nix +++ b/pkgs/development/libraries/haskell/enummapset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/enumset/default.nix b/pkgs/development/libraries/haskell/enumset/default.nix index 0bb03c67898..fefb424d495 100644 --- a/pkgs/development/libraries/haskell/enumset/default.nix +++ b/pkgs/development/libraries/haskell/enumset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, storableRecord }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/equivalence/default.nix b/pkgs/development/libraries/haskell/equivalence/default.nix index c25deac82c3..93446821224 100644 --- a/pkgs/development/libraries/haskell/equivalence/default.nix +++ b/pkgs/development/libraries/haskell/equivalence/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, STMonadTrans, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/erf/default.nix b/pkgs/development/libraries/haskell/erf/default.nix index 1a6331bcd6f..6904bdadb96 100644 --- a/pkgs/development/libraries/haskell/erf/default.nix +++ b/pkgs/development/libraries/haskell/erf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix index e3bfa5c569e..69949aeb575 100644 --- a/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix +++ b/pkgs/development/libraries/haskell/errorcall-eq-instance/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/errors/default.nix b/pkgs/development/libraries/haskell/errors/default.nix index 21ed85bb91f..d61bef4102d 100644 --- a/pkgs/development/libraries/haskell/errors/default.nix +++ b/pkgs/development/libraries/haskell/errors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, either, safe, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 0538e2f1899..09edb8c1214 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, hspec, HUnit, monadControl, monadLogger , persistent, persistentSqlite, persistentTemplate, QuickCheck , resourcet, tagged, text, transformers, unorderedContainers @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "1.4.1.2"; - sha256 = "1qny5c0xy2vdsl4qmgqr83jxqw1r68r81xhmx236rhxcffs9yvw2"; + version = "1.4.4"; + sha256 = "00s52f8l5pbsab83fq8d03xhispyp9mqsh5vvzwiki6kspkj26a0"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers @@ -17,7 +19,7 @@ cabal.mkDerivation (self: { transformers ]; meta = { - homepage = "https://github.com/meteficha/esqueleto"; + homepage = "https://github.com/prowdsponsor/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/event-list/default.nix b/pkgs/development/libraries/haskell/event-list/default.nix index 5305cd87d7d..99f48cb9a28 100644 --- a/pkgs/development/libraries/haskell/event-list/default.nix +++ b/pkgs/development/libraries/haskell/event-list/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, nonNegative, QuickCheck, random, transformers, utilityHt }: diff --git a/pkgs/development/libraries/haskell/ex-pool/default.nix b/pkgs/development/libraries/haskell/ex-pool/default.nix index b8e4e024afc..e3fc6cee650 100644 --- a/pkgs/development/libraries/haskell/ex-pool/default.nix +++ b/pkgs/development/libraries/haskell/ex-pool/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, hashable, stm, time, transformers, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/exception-mtl/default.nix b/pkgs/development/libraries/haskell/exception-mtl/default.nix index 5799a94334e..c19a9877138 100644 --- a/pkgs/development/libraries/haskell/exception-mtl/default.nix +++ b/pkgs/development/libraries/haskell/exception-mtl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptionTransformers, mtl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/exception-transformers/default.nix b/pkgs/development/libraries/haskell/exception-transformers/default.nix index a4d0cfd247a..bedbb527ff3 100644 --- a/pkgs/development/libraries/haskell/exception-transformers/default.nix +++ b/pkgs/development/libraries/haskell/exception-transformers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/exceptions/default.nix b/pkgs/development/libraries/haskell/exceptions/default.nix index 1cde47f48e1..1a56adb219c 100644 --- a/pkgs/development/libraries/haskell/exceptions/default.nix +++ b/pkgs/development/libraries/haskell/exceptions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, testFramework, testFrameworkQuickcheck2 , transformers }: diff --git a/pkgs/development/libraries/haskell/executable-path/default.nix b/pkgs/development/libraries/haskell/executable-path/default.nix index 5c69969c20d..93df3c3814f 100644 --- a/pkgs/development/libraries/haskell/executable-path/default.nix +++ b/pkgs/development/libraries/haskell/executable-path/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/explicit-exception/default.nix b/pkgs/development/libraries/haskell/explicit-exception/default.nix index 2542a4c1055..2cc0d456b17 100644 --- a/pkgs/development/libraries/haskell/explicit-exception/default.nix +++ b/pkgs/development/libraries/haskell/explicit-exception/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { pname = "explicit-exception"; - version = "0.1.7.2"; - sha256 = "0zncj57mpngszl7jz3khhd4dajzis7aag0ad62hc8rkrv2j8f5q4"; + version = "0.1.7.3"; + sha256 = "0f1p1llz6z4ag1wnf57mgm861cbw7va0g0m8klp6f6pnirdhlwz1"; isLibrary = true; isExecutable = true; buildDepends = [ transformers ]; diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index eb52756ce3b..72167d2d3a7 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, transformersBase }: @@ -11,6 +13,7 @@ cabal.mkDerivation (self: { HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; + jailbreak = true; meta = { homepage = "https://github.com/RobotGymnast/extensible-effects"; description = "An Alternative to Monad Transformers"; diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix index 0eca0eb78ee..4f1cd630596 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix index 946a808ddc5..279118e1301 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix index 577f7d4657a..9afa901de4f 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix index 2ca255d2999..2315d336ff9 100644 --- a/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix +++ b/pkgs/development/libraries/haskell/extensible-exceptions/0.1.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/failure/default.nix b/pkgs/development/libraries/haskell/failure/default.nix index 4181883f7b0..d8cd530075a 100644 --- a/pkgs/development/libraries/haskell/failure/default.nix +++ b/pkgs/development/libraries/haskell/failure/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index 9c9cae45b4b..6a1aa3dfb3c 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, filepath, hspec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fastcgi/default.nix b/pkgs/development/libraries/haskell/fastcgi/default.nix index 365be55c7bb..c1faf9ce96b 100644 --- a/pkgs/development/libraries/haskell/fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/fastcgi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cgi, fcgi }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index 417a0516bd8..9dd38ecda4b 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fay }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index c8d9188d421..68bbe884e87 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fay, fayBase, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index d32a5759780..10eafa70753 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,22 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom , haskellNames, haskellPackages, haskellSrcExts, languageEcmascript , mtl, optparseApplicative, safe, sourcemap, split, spoon, syb -, tasty, tastyHunit, tastyTh, text, transformers, uniplate +, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate , unorderedContainers, utf8String, vector }: cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.0.4"; - sha256 = "0cxcd4nxnq8nl03xgxa1nb0932hq4dz1lxpp3gqqs5k5wvs62303"; + version = "0.20.1.1"; + sha256 = "0jcvq880xnkm8aqr69ihwf7by55fc1bbd8wk8152zqgkih74qzc4"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec dataDefault filepath ghcPaths groom haskellNames haskellPackages haskellSrcExts languageEcmascript mtl optparseApplicative safe sourcemap split spoon syb tasty tastyHunit - tastyTh text transformers uniplate unorderedContainers utf8String - vector + tastyTh text time transformers uniplate unorderedContainers + utf8String vector ]; meta = { homepage = "http://fay-lang.org/"; diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 02f9f03588a..51a6ea84c50 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base16Bytestring, base64Bytestring , cereal, conduit, conduitExtra, cryptoApi, cryptohash , cryptohashCryptoapi, dataDefault, hspec, httpConduit, httpTypes @@ -8,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.1"; - sha256 = "0xhwv8fmhb1an15fnfjxzq0ijnhxxmfjwzd99dq1lsm0f7gd4hfi"; + version = "1.0.2"; + sha256 = "1xgldk690dpbmhzmjlngpbalmbs0xrc7265zc7frphpsbbw3cnqc"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault @@ -20,9 +22,10 @@ cabal.mkDerivation (self: { aeson conduit dataDefault hspec httpConduit HUnit liftedBase monadControl QuickCheck resourcet text time transformers ]; + jailbreak = true; doCheck = false; meta = { - homepage = "https://github.com/meteficha/fb"; + homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/fclabels/default.nix b/pkgs/development/libraries/haskell/fclabels/default.nix index 26029ed2c21..a7753f1a70d 100644 --- a/pkgs/development/libraries/haskell/fclabels/default.nix +++ b/pkgs/development/libraries/haskell/fclabels/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, transformers }: cabal.mkDerivation (self: { pname = "fclabels"; - version = "2.0.1.1"; - sha256 = "1r798fbdk4xzw649la9disnk1kngy3cmzbi3k8afiy8q6v1fbpwh"; + version = "2.0.2"; + sha256 = "108ad6l8ibz44n000hlywqpqslsz1czmsal7qvbd53chmmm4xgdp"; buildDepends = [ mtl transformers ]; meta = { homepage = "https://github.com/sebastiaanvisser/fclabels"; diff --git a/pkgs/development/libraries/haskell/fdo-notify/default.nix b/pkgs/development/libraries/haskell/fdo-notify/default.nix index 86f3d7e0d1d..170cf7b3395 100644 --- a/pkgs/development/libraries/haskell/fdo-notify/default.nix +++ b/pkgs/development/libraries/haskell/fdo-notify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dbus }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/feed/default.nix b/pkgs/development/libraries/haskell/feed/default.nix index 817276497da..3a5ec2ad1af 100644 --- a/pkgs/development/libraries/haskell/feed/default.nix +++ b/pkgs/development/libraries/haskell/feed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time, utf8String, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl-visualize/default.nix b/pkgs/development/libraries/haskell/fgl-visualize/default.nix index c446ae8545d..1f31985d928 100644 --- a/pkgs/development/libraries/haskell/fgl-visualize/default.nix +++ b/pkgs/development/libraries/haskell/fgl-visualize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dotgen, fgl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix index c367b74f6a3..dc7fc6e4457 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix index 8691d10c684..be83763d1d9 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix index 6a7aa22cef1..973fc415e0c 100644 --- a/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix +++ b/pkgs/development/libraries/haskell/fgl/5.4.2.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix index d475a9cb312..3bc1c39ba7c 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix +++ b/pkgs/development/libraries/haskell/fgl/5.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix index b9a582fd7b5..2e1bb2364b4 100644 --- a/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix +++ b/pkgs/development/libraries/haskell/fgl/5.5.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/file-embed/default.nix b/pkgs/development/libraries/haskell/file-embed/default.nix index a42e963d558..02eb043cc3a 100644 --- a/pkgs/development/libraries/haskell/file-embed/default.nix +++ b/pkgs/development/libraries/haskell/file-embed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, HUnit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/file-location/default.nix b/pkgs/development/libraries/haskell/file-location/default.nix index 8a28d0b27fb..6cff9640cdf 100644 --- a/pkgs/development/libraries/haskell/file-location/default.nix +++ b/pkgs/development/libraries/haskell/file-location/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, liftedBase, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/filemanip/default.nix b/pkgs/development/libraries/haskell/filemanip/default.nix index 94fa68977bb..38fc115141b 100644 --- a/pkgs/development/libraries/haskell/filemanip/default.nix +++ b/pkgs/development/libraries/haskell/filemanip/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, unixCompat }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix b/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix index 7a2b9e75e7f..e8bca5c63cf 100644 --- a/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix +++ b/pkgs/development/libraries/haskell/filepath/1.3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/filestore/default.nix b/pkgs/development/libraries/haskell/filestore/default.nix index 4aebded770e..fd33af07ee3 100644 --- a/pkgs/development/libraries/haskell/filestore/default.nix +++ b/pkgs/development/libraries/haskell/filestore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Diff, filepath, HUnit, mtl, parsec, split, time , utf8String, xml }: diff --git a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix index 3d7a1300b58..ecf9ae65e2e 100644 --- a/pkgs/development/libraries/haskell/filesystem-conduit/default.nix +++ b/pkgs/development/libraries/haskell/filesystem-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, hspec, QuickCheck, systemFileio , systemFilepath, text, transformers }: diff --git a/pkgs/development/libraries/haskell/final/default.nix b/pkgs/development/libraries/haskell/final/default.nix index 63226174118..3669d7e3649 100644 --- a/pkgs/development/libraries/haskell/final/default.nix +++ b/pkgs/development/libraries/haskell/final/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fingertree/default.nix b/pkgs/development/libraries/haskell/fingertree/default.nix index f48e1c4002e..4ea7f2ecd9e 100644 --- a/pkgs/development/libraries/haskell/fingertree/default.nix +++ b/pkgs/development/libraries/haskell/fingertree/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/flexible-defaults/default.nix b/pkgs/development/libraries/haskell/flexible-defaults/default.nix index 7be21dbbf34..d127225ffab 100644 --- a/pkgs/development/libraries/haskell/flexible-defaults/default.nix +++ b/pkgs/development/libraries/haskell/flexible-defaults/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, thExtras, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fmlist/default.nix b/pkgs/development/libraries/haskell/fmlist/default.nix index 8dcbb7fff18..1fbdedf76be 100644 --- a/pkgs/development/libraries/haskell/fmlist/default.nix +++ b/pkgs/development/libraries/haskell/fmlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix new file mode 100644 index 00000000000..480d974e2b8 --- /dev/null +++ b/pkgs/development/libraries/haskell/focus/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, lochTh, placeholders }: + +cabal.mkDerivation (self: { + pname = "focus"; + version = "0.1.2"; + sha256 = "0j157nv668621i94iqg923bfg7594bpfn0q9scb62cik2yikc1p0"; + buildDepends = [ lochTh placeholders ]; + meta = { + homepage = "https://github.com/nikita-volkov/focus"; + description = "A general abstraction for manipulating elements of container data structures"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 5224bf11f29..5952e335f43 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, primitive, text, transformers, vector }: cabal.mkDerivation (self: { pname = "foldl"; - version = "1.0.4"; - sha256 = "0l5gyaw2rb0wfdm5q13vsxfr0z2y9ad5nsjh605p1jp8i0rgwgkv"; + version = "1.0.5"; + sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048"; buildDepends = [ primitive text transformers vector ]; meta = { description = "Composable, streaming, and efficient left folds"; diff --git a/pkgs/development/libraries/haskell/folds/default.nix b/pkgs/development/libraries/haskell/folds/default.nix new file mode 100644 index 00000000000..41a834dbd84 --- /dev/null +++ b/pkgs/development/libraries/haskell/folds/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, contravariant, deepseq, doctest, filepath, hlint +, lens, mtl, pointed, profunctors, reflection, semigroupoids +, semigroups, tagged, transformers, vector +}: + +cabal.mkDerivation (self: { + pname = "folds"; + version = "0.6.1"; + sha256 = "13p4kyr48g917ib87n14qpqaka6isp73cwy7mvvsqgprj1fghyj1"; + buildDepends = [ + comonad contravariant lens pointed profunctors reflection + semigroupoids tagged transformers vector + ]; + testDepends = [ deepseq doctest filepath hlint mtl semigroups ]; + doCheck = false; + meta = { + homepage = "http://github.com/ekmett/folds"; + description = "Beautiful Folding"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 55437747f8b..99cd863b7c4 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, lens, vectorSpace, vectorSpacePoints }: cabal.mkDerivation (self: { @@ -7,6 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; + jailbreak = true; meta = { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/free-game/1.0.5.nix b/pkgs/development/libraries/haskell/free-game/1.0.5.nix index efe269db26c..16ee51d139f 100644 --- a/pkgs/development/libraries/haskell/free-game/1.0.5.nix +++ b/pkgs/development/libraries/haskell/free-game/1.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boundingboxes, colors, controlBool, filepath, free , freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers diff --git a/pkgs/development/libraries/haskell/free-game/1.1.nix b/pkgs/development/libraries/haskell/free-game/1.1.nix index b19e3202741..76139aa7e5d 100644 --- a/pkgs/development/libraries/haskell/free-game/1.1.nix +++ b/pkgs/development/libraries/haskell/free-game/1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boundingboxes, colors, controlBool, filepath, free , freetype2, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens , linear, mtl, OpenGL, OpenGLRaw, random, reflection, transformers diff --git a/pkgs/development/libraries/haskell/free-operational/default.nix b/pkgs/development/libraries/haskell/free-operational/default.nix deleted file mode 100644 index 80457756384..00000000000 --- a/pkgs/development/libraries/haskell/free-operational/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ cabal, comonadTransformers, free, kanExtensions, mtl, comonad -, transformers -}: - -cabal.mkDerivation (self: { - pname = "free-operational"; - version = "0.5.0.0"; - sha256 = "0gim4m0l76sxxg6a8av1gl6qjpwxwdzyviij86d06v1150r08dmb"; - jailbreak = true; # needs an old version of kan-extensions - buildDepends = [ - comonadTransformers free kanExtensions mtl transformers comonad - ]; - meta = { - description = "Operational Applicative, Alternative, Monad and MonadPlus from free types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index b445bf49448..8aea1b312a0 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bifunctors, comonad, distributive, mtl, preludeExtras , profunctors, semigroupoids, semigroups, transformers }: diff --git a/pkgs/development/libraries/haskell/freetype2/default.nix b/pkgs/development/libraries/haskell/freetype2/default.nix index 145ae4a2d79..d5fdc8f926e 100644 --- a/pkgs/development/libraries/haskell/freetype2/default.nix +++ b/pkgs/development/libraries/haskell/freetype2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ftphs/default.nix b/pkgs/development/libraries/haskell/ftphs/default.nix index c682c593ea6..ac96b094799 100644 --- a/pkgs/development/libraries/haskell/ftphs/default.nix +++ b/pkgs/development/libraries/haskell/ftphs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hslogger, MissingH, mtl, network, parsec, regexCompat }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix index d17ca718f0a..1e0ee45de59 100644 --- a/pkgs/development/libraries/haskell/funcmp/default.nix +++ b/pkgs/development/libraries/haskell/funcmp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/fuzzcheck/default.nix b/pkgs/development/libraries/haskell/fuzzcheck/default.nix index a1da7f8ebbf..171a501667f 100644 --- a/pkgs/development/libraries/haskell/fuzzcheck/default.nix +++ b/pkgs/development/libraries/haskell/fuzzcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, hspecExpectations, HUnit, liftedBase, monadControl , QuickCheck, random, transformers }: diff --git a/pkgs/development/libraries/haskell/gamma/default.nix b/pkgs/development/libraries/haskell/gamma/default.nix index 8fbdb57d48b..c2117bffa7e 100644 --- a/pkgs/development/libraries/haskell/gamma/default.nix +++ b/pkgs/development/libraries/haskell/gamma/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, continuedFractions, converge, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gd/default.nix b/pkgs/development/libraries/haskell/gd/default.nix index 27423ce4ecd..bf482780060 100644 --- a/pkgs/development/libraries/haskell/gd/default.nix +++ b/pkgs/development/libraries/haskell/gd/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, expat, fontconfig, freetype, gd, libjpeg, libpng, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gdiff/default.nix b/pkgs/development/libraries/haskell/gdiff/default.nix index e14857aaa5b..1b94961e4ee 100644 --- a/pkgs/development/libraries/haskell/gdiff/default.nix +++ b/pkgs/development/libraries/haskell/gdiff/default.nix @@ -1,10 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "gdiff"; - version = "1.0"; - sha256 = "35257b1090cf78f95d24c7a89920863c1d824652311fa5793693d7d06d96517b"; + version = "1.1"; + sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc"; meta = { + homepage = "https://github.com/eelco/gdiff"; description = "Generic diff and patch"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/generic-aeson/default.nix b/pkgs/development/libraries/haskell/generic-aeson/default.nix new file mode 100644 index 00000000000..9c18b511efc --- /dev/null +++ b/pkgs/development/libraries/haskell/generic-aeson/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, genericDeriving, mtl, tagged, text +, vector +}: + +cabal.mkDerivation (self: { + pname = "generic-aeson"; + version = "0.1.1.1"; + sha256 = "14jpma2p4dxmzpwd557igbg7xhgdzp9w9fm6dxa06sgfqxvb7ln1"; + buildDepends = [ + aeson attoparsec genericDeriving mtl tagged text vector + ]; + meta = { + description = "Derivation of Aeson instances using GHC generics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/generic-deriving/default.nix b/pkgs/development/libraries/haskell/generic-deriving/default.nix index 9b1d911638f..c1e3ee5caad 100644 --- a/pkgs/development/libraries/haskell/generic-deriving/default.nix +++ b/pkgs/development/libraries/haskell/generic-deriving/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/geniplate/default.nix b/pkgs/development/libraries/haskell/geniplate/default.nix index bebc611ddaa..9ab6d2df709 100644 --- a/pkgs/development/libraries/haskell/geniplate/default.nix +++ b/pkgs/development/libraries/haskell/geniplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-core/default.nix b/pkgs/development/libraries/haskell/ghc-core/default.nix index 8c2f481122b..60a2284fa7a 100644 --- a/pkgs/development/libraries/haskell/ghc-core/default.nix +++ b/pkgs/development/libraries/haskell/ghc-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, colorizeHaskell, filepath, pcreLight }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 4f908200c88..46dfa17063a 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 679ced622d9..c32d3be5308 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-mod/default.nix b/pkgs/development/libraries/haskell/ghc-mod/default.nix index 04545dda87e..3fd12bcfc55 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, convertible, deepseq, doctest, emacs, filepath , ghcSybUtils, hlint, hspec, ioChoice, syb, time, transformers }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "4.1.2"; - sha256 = "0xdpy61dc56zvpgr2z9cdyd85d65l426vnbfgsw6w494w0bp3sh7"; + version = "4.1.5"; + sha256 = "192v0h9nhi7xgvidyisn3rpr6kjpkibrm2b859b6a92gp0h37nnn"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,6 +23,7 @@ cabal.mkDerivation (self: { configureFlags = "--datasubdir=${self.pname}-${self.version}"; postInstall = '' cd $out/share/$pname-$version + sed -i -e 's/"-b" "\\n" "-l"/"-l" "-b" "\\"\\\\n\\""/' ghc-process.el make rm Makefile cd .. diff --git a/pkgs/development/libraries/haskell/ghc-mtl/default.nix b/pkgs/development/libraries/haskell/ghc-mtl/default.nix index 29e00d8a2d3..61319f1fb5a 100644 --- a/pkgs/development/libraries/haskell/ghc-mtl/default.nix +++ b/pkgs/development/libraries/haskell/ghc-mtl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, extensibleExceptions, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-paths/default.nix b/pkgs/development/libraries/haskell/ghc-paths/default.nix index b930e993dcc..0a2b7dc18f3 100644 --- a/pkgs/development/libraries/haskell/ghc-paths/default.nix +++ b/pkgs/development/libraries/haskell/ghc-paths/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index 8032e8b6afd..099eecd2628 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-syb/default.nix b/pkgs/development/libraries/haskell/ghc-syb/default.nix index 21a2f0f00eb..88673b04798 100644 --- a/pkgs/development/libraries/haskell/ghc-syb/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index a15ed9d1c47..bfcc3e70472 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, deepseq, fgl, ghcHeapView, graphviz, gtk, mtl , svgcairo, text, transformers, xdot }: diff --git a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix index 3f15f394c2c..06473e161fb 100644 --- a/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-codemirror/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 2c9770b20e3..b0d2d9f30c4 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ghcjsBase, mtl }: cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.0.9"; - sha256 = "0vphhm9wr80p4brcjzhmp2kh0a5rlwzif26w2q054fshxa97kv2a"; + version = "0.0.10"; + sha256 = "0xffr197m6qam4q7ckgcwl0v9kwrxa5fm894c9vyxdmlcjyn38rm"; buildDepends = [ ghcjsBase mtl ]; meta = { description = "DOM library that supports both GHCJS and WebKitGTK"; diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 19d51d93aab..f189ca43f96 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, glib, gtk2hsBuildtools, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/git-date/default.nix b/pkgs/development/libraries/haskell/git-date/default.nix index 9124da6c7a6..c4d135d2f15 100644 --- a/pkgs/development/libraries/haskell/git-date/default.nix +++ b/pkgs/development/libraries/haskell/git-date/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2, time , utf8String }: diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 41ee872bb31..68c46f5866d 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, caseInsensitive, conduit, dataDefault , failure, hashable, HTTP, httpConduit, httpTypes, network, text , time, unorderedContainers, vector diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 6c30ca18b88..6214c94210c 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,32 +1,26 @@ -{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed -, filepath, filestore, ghcPaths, happstackServer, highlightingKate -, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc -, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup -, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib, fetchpatch +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath +, filestore, ghcPaths, happstackServer, highlightingKate, hslogger +, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes +, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text +, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.3.1"; - sha256 = "1sm6rryfyqr0nd4flbc5d520xyw2ajnkylvqf4fi4dhl6fnbpam5"; + version = "0.10.4"; + sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore + base64Bytestring blazeHtml ConfigFile feed filepath filestore ghcPaths happstackServer highlightingKate hslogger HStringTemplate HTTP json mtl network pandoc pandocTypes parsec random recaptcha - safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize - zlib + safe SHA split syb tagsoup text time uri url utf8String xhtml xml + xssSanitize zlib ]; jailbreak = true; - patches = [ (fetchpatch { - url = "https://github.com/jgm/gitit/commit/48155008397bdaed4f97c5678d83c70d4bc3f0ff.patch"; - sha256 = "16n372wrikwb3g4pb3zljxnp19in0828wp40diqgkplhlnwww6nw"; - }) - ]; - preConfigure = '' - sed -i -e 's|network .*< 2.5|network|' gitit.cabal - ''; meta = { homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix new file mode 100644 index 00000000000..fcff6006761 --- /dev/null +++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, conduit, conduitCombinators, exceptions, fastLogger +, filepath, gitlib, gitlibTest, hlibgit2, hspec, hspecExpectations +, HUnit, liftedAsync, liftedBase, missingForeign, mmorph +, monadControl, monadLogger, monadLoops, mtl, resourcet, stm +, stmConduit, tagged, text, textIcu, time, transformers +, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "gitlib-libgit2"; + version = "3.1.0"; + sha256 = "1kjwc36fd14j2ipw53j8hdsy29gxir1qrm54wxgpp5n4q2kcs9pq"; + buildDepends = [ + conduit conduitCombinators exceptions fastLogger filepath gitlib + hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl + monadLogger monadLoops mtl resourcet stm stmConduit tagged text + textIcu time transformers transformersBase + ]; + testDepends = [ + exceptions gitlib gitlibTest hspec hspecExpectations HUnit + monadLogger transformers + ]; + meta = { + description = "Libgit2 backend for gitlib"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix new file mode 100644 index 00000000000..d5467d28767 --- /dev/null +++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, conduit, conduitCombinators, exceptions, gitlib, hspec +, hspecExpectations, HUnit, monadControl, tagged, text, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "gitlib-test"; + version = "3.1.0"; + sha256 = "0hnwx5r9fdkxvx0zmqffpym921dvf1x2lky8w11y3rfhk9i1g7l4"; + buildDepends = [ + conduit conduitCombinators exceptions gitlib hspec + hspecExpectations HUnit monadControl tagged text time transformers + ]; + meta = { + description = "Test library for confirming gitlib backend compliance"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/gitlib/default.nix b/pkgs/development/libraries/haskell/gitlib/default.nix new file mode 100644 index 00000000000..52f3137b5eb --- /dev/null +++ b/pkgs/development/libraries/haskell/gitlib/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, base16Bytestring, conduit, conduitCombinators, exceptions +, filepath, hashable, liftedAsync, liftedBase, monadControl +, monadLogger, mtl, resourcet, semigroups, systemFilepath, tagged +, text, time, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "gitlib"; + version = "3.1.0"; + sha256 = "0zyym7m8bdhc4wi2jrhcmipmlq106qkd61c4y9iisgk73v2pg9f4"; + buildDepends = [ + base16Bytestring conduit conduitCombinators exceptions filepath + hashable liftedAsync liftedBase monadControl monadLogger mtl + resourcet semigroups systemFilepath tagged text time transformers + unorderedContainers + ]; + meta = { + description = "API library for working with Git repositories"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/glade/default.nix b/pkgs/development/libraries/haskell/glade/default.nix index 30711083d2c..68ed02f4b18 100644 --- a/pkgs/development/libraries/haskell/glade/default.nix +++ b/pkgs/development/libraries/haskell/glade/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, glib, gtk, gtk2hsBuildtools, gtkC, libc, libglade , pkgconfig }: diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 25e668081d7..055f61cbc76 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, glib, gtk2hsBuildtools, libc, pkgconfig, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix index 2c53925f975..66e6805ab54 100644 --- a/pkgs/development/libraries/haskell/gloss-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-accelerate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, accelerateCuda, gloss }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix index db5b62169c4..2a51b17dcd5 100644 --- a/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster-accelerate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, accelerate, accelerateCuda, gloss, glossAccelerate }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix index 3ae49673078..3dfb6d7832c 100644 --- a/pkgs/development/libraries/haskell/gloss-raster/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, gloss, llvm, repa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 5fff36e66ea..9ae9c443398 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bmp, GLUT, OpenGL }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/glpk-hs/default.nix b/pkgs/development/libraries/haskell/glpk-hs/default.nix index fbbe7d31c2a..52776e53c3d 100644 --- a/pkgs/development/libraries/haskell/glpk-hs/default.nix +++ b/pkgs/development/libraries/haskell/glpk-hs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, glpk, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gnuidn/default.nix b/pkgs/development/libraries/haskell/gnuidn/default.nix index 9192f6bb29b..8bedf0d4186 100644 --- a/pkgs/development/libraries/haskell/gnuidn/default.nix +++ b/pkgs/development/libraries/haskell/gnuidn/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, libidn, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gnuplot/default.nix b/pkgs/development/libraries/haskell/gnuplot/default.nix index f835410dbbd..dc152661049 100644 --- a/pkgs/development/libraries/haskell/gnuplot/default.nix +++ b/pkgs/development/libraries/haskell/gnuplot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, dataAccessorTransformers, deepseq, filepath , temporary, time, transformers, utilityHt }: diff --git a/pkgs/development/libraries/haskell/gnutls/default.nix b/pkgs/development/libraries/haskell/gnutls/default.nix index 8e77a0626ce..5d8ee9b61df 100644 --- a/pkgs/development/libraries/haskell/gnutls/default.nix +++ b/pkgs/development/libraries/haskell/gnutls/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, gnutls, monadsTf, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/graph-wrapper/default.nix b/pkgs/development/libraries/haskell/graph-wrapper/default.nix index 86d25c24fda..711f490aa19 100644 --- a/pkgs/development/libraries/haskell/graph-wrapper/default.nix +++ b/pkgs/development/libraries/haskell/graph-wrapper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/graphscc/default.nix b/pkgs/development/libraries/haskell/graphscc/default.nix index 3f04e668a8f..6c45bde15d8 100644 --- a/pkgs/development/libraries/haskell/graphscc/default.nix +++ b/pkgs/development/libraries/haskell/graphscc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/graphviz/default.nix b/pkgs/development/libraries/haskell/graphviz/default.nix index 18ef54746a9..d44ac9442a7 100644 --- a/pkgs/development/libraries/haskell/graphviz/default.nix +++ b/pkgs/development/libraries/haskell/graphviz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, colour, dlist, fgl, filepath, polyparse, QuickCheck , temporary, text, transformers, wlPprintText }: diff --git a/pkgs/development/libraries/haskell/groom/default.nix b/pkgs/development/libraries/haskell/groom/default.nix index d3772b022d7..41853b763f4 100644 --- a/pkgs/development/libraries/haskell/groom/default.nix +++ b/pkgs/development/libraries/haskell/groom/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/groupoids/default.nix b/pkgs/development/libraries/haskell/groupoids/default.nix index 7697e8e369f..1f0c73c00db 100644 --- a/pkgs/development/libraries/haskell/groupoids/default.nix +++ b/pkgs/development/libraries/haskell/groupoids/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroupoids }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/groups/default.nix b/pkgs/development/libraries/haskell/groups/default.nix index b2cf829f12e..4f9fb3f67ae 100644 --- a/pkgs/development/libraries/haskell/groups/default.nix +++ b/pkgs/development/libraries/haskell/groups/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gsasl/default.nix b/pkgs/development/libraries/haskell/gsasl/default.nix index 5a654cdd11d..da0ab99d976 100644 --- a/pkgs/development/libraries/haskell/gsasl/default.nix +++ b/pkgs/development/libraries/haskell/gsasl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, gsasl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix index 21a06638f68..c588ac9a24c 100644 --- a/pkgs/development/libraries/haskell/gtk-traymanager/default.nix +++ b/pkgs/development/libraries/haskell/gtk-traymanager/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, glib, gtk, x11 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 98d7f5b96cd..9fd8cf6f303 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -1,4 +1,6 @@ -{ cabal, cairo, glib, gtk, gtk2hsBuildtools, libc, mtl, pango +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cairo, gio, glib, gtk, gtk2hsBuildtools, libc, mtl, pango , pkgconfig }: @@ -6,7 +8,7 @@ cabal.mkDerivation (self: { pname = "gtk"; version = "0.12.5.7"; sha256 = "0hax4ixdz523753rc774c8g76bjlj56lsabyl5nwkpnppffpa73w"; - buildDepends = [ cairo glib mtl pango ]; + buildDepends = [ cairo gio glib mtl pango ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; pkgconfigDepends = [ glib gtk ]; diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 52bdebd8a40..e0a0053b2ea 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, filepath, happy, hashtables, random }: cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.12.5.2"; - sha256 = "1w4mfwkiqil9xd1xl4himb6vnl66hxb7a4vch6wh3bfad880qyiw"; + version = "0.13.0.0"; + sha256 = "075f6jjkk56h0nda0gbdr775d72c0b3d2z483cff2bnnjf8aqwa6"; isLibrary = false; isExecutable = true; buildDepends = [ filepath hashtables random ]; diff --git a/pkgs/development/libraries/haskell/gtkglext/default.nix b/pkgs/development/libraries/haskell/gtkglext/default.nix index b98b478429c..3953395a07a 100644 --- a/pkgs/development/libraries/haskell/gtkglext/default.nix +++ b/pkgs/development/libraries/haskell/gtkglext/default.nix @@ -1,12 +1,16 @@ -{ pkgs, cabal, gtk, gtk2hsBuildtools, pangox_compat }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, glib, gtk, gtk2hsBuildtools, gtkglext, pango +, pangox_compat +}: cabal.mkDerivation (self: { pname = "gtkglext"; version = "0.12.5.0"; sha256 = "1xhalcb85cpswdpqxx64fxpmyqq7iakgaczjrbr25fp0h1glshhk"; - buildDepends = [ gtk ]; + buildDepends = [ glib gtk pango ]; buildTools = [ gtk2hsBuildtools ]; - pkgconfigDepends = [ pkgs.gnome2.gtkglext pangox_compat ]; + pkgconfigDepends = [ gtkglext pangox_compat ]; meta = { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GTK+ OpenGL Extension"; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index 492a343e209..caa825535ec 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, glib, gtk, gtk2hsBuildtools, gtksourceview, libc, mtl , pkgconfig }: diff --git a/pkgs/development/libraries/haskell/hS3/default.nix b/pkgs/development/libraries/haskell/hS3/default.nix index 1d6838e92f8..50f5bb8ecaf 100644 --- a/pkgs/development/libraries/haskell/hS3/default.nix +++ b/pkgs/development/libraries/haskell/hS3/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Crypto, dataenc, HTTP, hxt, MissingH, network, random , regexCompat, utf8String }: diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 46e2913572e..3164d213870 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, tar, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 06e835b9ab5..01023bd2fe9 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash , dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes , HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec diff --git a/pkgs/development/libraries/haskell/hamlet/default.nix b/pkgs/development/libraries/haskell/hamlet/default.nix index c3e58cf34dc..f667686a841 100644 --- a/pkgs/development/libraries/haskell/hamlet/default.nix +++ b/pkgs/development/libraries/haskell/hamlet/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix b/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix index 858512e9add..462dd2cc4e3 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-fastcgi.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cgi, fastcgi, happstackServer, mtl, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix index d8a1b0ef6fc..5d2faa621b0 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happstackServer, shakespeare, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index 01cf7262783..610220cc09e 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happstackServer, mtl, text }: cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.3"; - sha256 = "0iv60cch0fiy9kh21wcpk3s4nvd4j2p50pqr3y56bsqwxk53hhv8"; + version = "7.3.4"; + sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index e59bccaf6b5..5f6bd187c3a 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeHtml, extensibleExceptions , filepath, hslogger, html, HUnit, monadControl, mtl, network , parsec, sendfile, syb, systemFilepath, text, threads, time @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.6"; - sha256 = "0js1rzg1zpqg9mbi0kdzb5i8ggsrq4l8p0c05k85ppw6h5lwkayd"; + version = "7.3.7"; + sha256 = "1phw3hpnklcdav3wv10kwjsmrg8gshnsgd564p459pc4k2zffgh1"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network parsec sendfile syb systemFilepath diff --git a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix index ffb3f98e8b3..1a5d3b9883b 100644 --- a/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix +++ b/pkgs/development/libraries/haskell/hashable/1.1.2.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, random, testFramework , testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix b/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix index 2ae7f353992..d6734dc814f 100644 --- a/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix +++ b/pkgs/development/libraries/haskell/hashable/1.2.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/hashed-storage/default.nix b/pkgs/development/libraries/haskell/hashed-storage/default.nix index e2a82e13b3e..becd9e4fed8 100644 --- a/pkgs/development/libraries/haskell/hashed-storage/default.nix +++ b/pkgs/development/libraries/haskell/hashed-storage/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, dataenc, extensibleExceptions, filepath, mmap, mtl , zlib }: diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index ca0e2e529c5..b011d9e3f2e 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, primitive, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskeline-class/default.nix b/pkgs/development/libraries/haskell/haskeline-class/default.nix index 76080574fcc..aacabe75c0d 100644 --- a/pkgs/development/libraries/haskell/haskeline-class/default.nix +++ b/pkgs/development/libraries/haskell/haskeline-class/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskeline, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskeline/default.nix b/pkgs/development/libraries/haskell/haskeline/default.nix index bff64a72f69..a1d9295e3e5 100644 --- a/pkgs/development/libraries/haskell/haskeline/default.nix +++ b/pkgs/development/libraries/haskell/haskeline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, terminfo, transformers, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix index b650714127c..ad482d33d7b 100644 --- a/pkgs/development/libraries/haskell/haskell-generate/default.nix +++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, filepath, haskellSrcExts, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-lexer/default.nix b/pkgs/development/libraries/haskell/haskell-lexer/default.nix index 9aa1bdea951..ea6a46f3f49 100644 --- a/pkgs/development/libraries/haskell/haskell-lexer/default.nix +++ b/pkgs/development/libraries/haskell/haskell-lexer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-mpi/default.nix b/pkgs/development/libraries/haskell/haskell-mpi/default.nix index add910b6193..099c2afb51d 100644 --- a/pkgs/development/libraries/haskell/haskell-mpi/default.nix +++ b/pkgs/development/libraries/haskell/haskell-mpi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, cereal, extensibleExceptions, mpi }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index 18720818459..fee2ff2c179 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, Cabal, dataLensLight, filemanip, filepath , haskellPackages, haskellSrcExts, hseCpp, mtl, prettyShow, tagged , tasty, tastyGolden, transformers, traverseWithClass, typeEq diff --git a/pkgs/development/libraries/haskell/haskell-packages/default.nix b/pkgs/development/libraries/haskell/haskell-packages/default.nix index 168c6babb3d..24cd46c0de7 100644 --- a/pkgs/development/libraries/haskell/haskell-packages/default.nix +++ b/pkgs/development/libraries/haskell/haskell-packages/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, Cabal, deepseq, either, filepath, haskellSrcExts , hseCpp, mtl, optparseApplicative, tagged }: cabal.mkDerivation (self: { pname = "haskell-packages"; - version = "0.2.4"; - sha256 = "1ygpa2k0hyx2xwny33kr0h847zvvsp4z1pwqrd92sf7vzpyz5nch"; + version = "0.2.4.1"; + sha256 = "014zcq27rwsgj3n4kdgswbppr5yzf3lnj5gnv45r3i5c3rd1mz6k"; buildDepends = [ aeson Cabal deepseq either filepath haskellSrcExts hseCpp mtl optparseApplicative tagged diff --git a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix index 369d7fbb8c8..eac734a8422 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix @@ -22,6 +22,5 @@ cabal.mkDerivation (self : { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # cgi and cabal-install won't compile }; }) diff --git a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix index 65395662a89..8c1630752ec 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/2010.1.0.0.nix @@ -22,6 +22,6 @@ cabal.mkDerivation (self : { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [andres simons]; - broken = true; # cgi libary doesn't compile + broken = true; # The source code is no longer available from haskell.org. }; }) diff --git a/pkgs/development/libraries/haskell/haskell-platform/default.nix b/pkgs/development/libraries/haskell/haskell-platform/default.nix index b222df29b5a..2de2809cf53 100644 --- a/pkgs/development/libraries/haskell/haskell-platform/default.nix +++ b/pkgs/development/libraries/haskell/haskell-platform/default.nix @@ -257,6 +257,8 @@ let stm = self.stm_2_1_1_2; xhtml = self.xhtml_3000_2_0_1; happy = self.happy_1_18_4; + # not actually specified, but important to make the whole thing build + mtl = self.mtl_1_1_0_2; }; }; @@ -285,6 +287,8 @@ let cabalInstall = self.cabalInstall_0_6_2; alex = self.alex_2_3_1; happy = self.happy_1_18_4; + # not actually specified, but important to make the whole thing build + mtl = self.mtl_1_1_0_2; }; }; diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix index 5521e037b4e..6368b76d80c 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.13.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs, happy }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix index b5522101764..38f556ce9f4 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs, filemanip, filepath, happy, mtl, smallcheck, syb , tasty, tastyGolden, tastySmallcheck }: diff --git a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix index b54b1ff753d..7de049b84f3 100644 --- a/pkgs/development/libraries/haskell/haskell-src-meta/default.nix +++ b/pkgs/development/libraries/haskell/haskell-src-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, syb, thOrphans, uniplate }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix index 6729cbef2aa..9b47d4a8514 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix index 1895a655d92..07f8fb7c0fa 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix index cfaabe7f6b0..02032c21120 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix index 9e78f2800a7..dffbe9a6ee2 100644 --- a/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskell-token-utils/default.nix b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix new file mode 100644 index 00000000000..378dfe898ea --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-token-utils/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Diff, dualTree, ghcMod, ghcPaths, ghcSybUtils +, haskellSrcExts, hspec, HUnit, monoidExtras, mtl, QuickCheck +, rosezipper, semigroups, syb, uniplate +}: + +cabal.mkDerivation (self: { + pname = "haskell-token-utils"; + version = "0.0.0.4"; + sha256 = "0bb47g58m76293dw4h349j3fmajmw62rqna2kcgx681a1rsbpb4i"; + buildDepends = [ + dualTree ghcPaths ghcSybUtils haskellSrcExts monoidExtras mtl + rosezipper semigroups syb + ]; + testDepends = [ + Diff dualTree ghcMod ghcPaths ghcSybUtils haskellSrcExts hspec + HUnit monoidExtras mtl QuickCheck rosezipper semigroups syb + uniplate + ]; + meta = { + homepage = "https://github.com/alanz/haskell-token-utils"; + description = "Utilities to tie up tokens to an AST"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/haskelldb/default.nix b/pkgs/development/libraries/haskell/haskelldb/default.nix index fde1d71b2b0..b6788da2a8d 100644 --- a/pkgs/development/libraries/haskell/haskelldb/default.nix +++ b/pkgs/development/libraries/haskell/haskelldb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haskore/default.nix b/pkgs/development/libraries/haskell/haskore/default.nix index 7e3ebb6476b..5f7812686d5 100644 --- a/pkgs/development/libraries/haskell/haskore/default.nix +++ b/pkgs/development/libraries/haskell/haskore/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataAccessor, eventList, haskellSrc, markovChain, midi , nonNegative, parsec, random, transformers, utilityHt }: diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix index 20fc429fc63..8f4f996fdd5 100644 --- a/pkgs/development/libraries/haskell/hastache/default.nix +++ b/pkgs/development/libraries/haskell/hastache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, filepath, HUnit, ieee754, mtl, syb, text , transformers, utf8String }: diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix new file mode 100644 index 00000000000..0b5f4875a75 --- /dev/null +++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754 +, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf +, mtl, network, random, shellmate, systemFileio, tar, temporary +, time, transformers, utf8String, websockets, zipArchive +}: + +cabal.mkDerivation (self: { + pname = "haste-compiler"; + version = "0.3"; + sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + binary blazeBuilder bzlib dataBinaryIeee754 dataDefault + executablePath filepath ghcPaths HTTP monadsTf mtl network random + shellmate systemFileio tar temporary time transformers utf8String + websockets zipArchive + ]; + meta = { + homepage = "http://github.com/valderman/haste-compiler"; + description = "Haskell To ECMAScript compiler"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/haxl/default.nix b/pkgs/development/libraries/haskell/haxl/default.nix new file mode 100644 index 00000000000..9208c4154ef --- /dev/null +++ b/pkgs/development/libraries/haskell/haxl/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, filepath, hashable, HUnit, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "haxl"; + version = "0.1.0.0"; + sha256 = "1spkcvsy0p3ksxapaz93db09y2jsswr5k6qs6cvxmwxxhbnswv36"; + buildDepends = [ + aeson filepath hashable HUnit text time unorderedContainers vector + ]; + testDepends = [ aeson hashable HUnit text unorderedContainers ]; + meta = { + homepage = "https://github.com/facebook/Haxl"; + description = "A Haskell library for efficient, concurrent, and concise data access"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/haxr-th/default.nix b/pkgs/development/libraries/haskell/haxr-th/default.nix index b319857bac3..ef0b306768b 100644 --- a/pkgs/development/libraries/haskell/haxr-th/default.nix +++ b/pkgs/development/libraries/haskell/haxr-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haxr }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/haxr/default.nix b/pkgs/development/libraries/haskell/haxr/default.nix index eff9ada1da5..31b3f5e3333 100644 --- a/pkgs/development/libraries/haskell/haxr/default.nix +++ b/pkgs/development/libraries/haskell/haxr/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, HaXml, HTTP, mtl, network , time, utf8String }: cabal.mkDerivation (self: { pname = "haxr"; - version = "3000.10.2"; - sha256 = "10fgz1vvrx09pvlxp0k772xbfni8c8lxbjp59vzm95v2kc4hnagc"; + version = "3000.10.3"; + sha256 = "082w86vawjiqz589s3gmawssd0b43b1vcw0h6cndadwww8yc35bg"; buildDepends = [ base64Bytestring blazeBuilder HaXml HTTP mtl network time utf8String diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix index 170c885d240..bc2c01268bb 100644 --- a/pkgs/development/libraries/haskell/hcltest/default.nix +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dlist, doctest, either, filepath, free, lens, mmorph , monadControl, mtl, optparseApplicative, randomShuffle, split, stm , tagged, tasty, temporary, text, transformers, transformersBase @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hcltest"; - version = "0.3.1"; - sha256 = "0qnf6ib01njcbjfbwxff8y4sqmrj6nyy9y9hb0l0kw21cxsgl7c9"; + version = "0.3.3"; + sha256 = "191fpvcr5hg902akcvq9wcsy801drqwrl7xqk0bqy003ffrv4228"; buildDepends = [ dlist either filepath free lens mmorph monadControl mtl optparseApplicative randomShuffle split stm tagged tasty temporary diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix new file mode 100644 index 00000000000..97133920389 --- /dev/null +++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, extensibleExceptions, filepath, hsyslog, mtl }: + +cabal.mkDerivation (self: { + pname = "hdaemonize"; + version = "0.4.5.0"; + sha256 = "1b9aic08pgmp95qy74qcrmq9dn33k6knycy7mn1dg8c5svmchb2w"; + buildDepends = [ extensibleExceptions filepath hsyslog mtl ]; + meta = { + homepage = "http://github.com/madhadron/hdaemonize"; + description = "Library to handle the details of writing daemons for UNIX"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hedis/default.nix b/pkgs/development/libraries/haskell/hedis/default.nix index c4e34b2d361..47cf3fee865 100644 --- a/pkgs/development/libraries/haskell/hedis/default.nix +++ b/pkgs/development/libraries/haskell/hedis/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, BoundedChan, bytestringLexing, HUnit, mtl , network, resourcePool, testFramework, testFrameworkHunit, time , vector @@ -12,11 +14,11 @@ cabal.mkDerivation (self: { time vector ]; testDepends = [ HUnit mtl testFramework testFrameworkHunit time ]; + doCheck = false; meta = { homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - doCheck = false; }) diff --git a/pkgs/development/libraries/haskell/heist/default.nix b/pkgs/development/libraries/haskell/heist/default.nix index 77128310d52..b1422f616c9 100644 --- a/pkgs/development/libraries/haskell/heist/default.nix +++ b/pkgs/development/libraries/haskell/heist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree , dlist, errors, filepath, hashable, MonadCatchIOTransformers, mtl , random, text, time, transformers, unorderedContainers, vector diff --git a/pkgs/development/libraries/haskell/heredoc/default.nix b/pkgs/development/libraries/haskell/heredoc/default.nix index c488fdd153b..13f417c8f98 100644 --- a/pkgs/development/libraries/haskell/heredoc/default.nix +++ b/pkgs/development/libraries/haskell/heredoc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hexpat/default.nix b/pkgs/development/libraries/haskell/hexpat/default.nix index 77416cec5e4..9e2e6d93f83 100644 --- a/pkgs/development/libraries/haskell/hexpat/default.nix +++ b/pkgs/development/libraries/haskell/hexpat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, List, text, transformers, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hflags/default.nix b/pkgs/development/libraries/haskell/hflags/default.nix index 04e70183781..c48130c555c 100644 --- a/pkgs/development/libraries/haskell/hflags/default.nix +++ b/pkgs/development/libraries/haskell/hflags/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hfsevents/default.nix b/pkgs/development/libraries/haskell/hfsevents/default.nix index 3f4b1355c61..acf9121b3d9 100644 --- a/pkgs/development/libraries/haskell/hfsevents/default.nix +++ b/pkgs/development/libraries/haskell/hfsevents/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, gccApple, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hgal/default.nix b/pkgs/development/libraries/haskell/hgal/default.nix index b8d86d5d303..7c52ddca91c 100644 --- a/pkgs/development/libraries/haskell/hgal/default.nix +++ b/pkgs/development/libraries/haskell/hgal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix new file mode 100644 index 00000000000..ba161493109 --- /dev/null +++ b/pkgs/development/libraries/haskell/hi/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, hspec, HUnit, parsec, split, template +, temporaryRc, text, time +}: + +cabal.mkDerivation (self: { + pname = "hi"; + version = "0.0.8.1"; + sha256 = "14g1yfc6cv89whx6w0di5nayifc0xfvll9h07kkqxaajyfw6s32y"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + filepath parsec split template temporaryRc text time + ]; + testDepends = [ + filepath hspec HUnit parsec split template temporaryRc text time + ]; + meta = { + homepage = "https://github.com/fujimura/hi"; + description = "Generate scaffold for cabal project"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index 6418c7f0326..5eeedef33cc 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, filepath, mtl, parsec, regexPcre, utf8String }: cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.8.2"; - sha256 = "1c85yfzi3ri3j1fmqvd4pc4pp95jpm62a2nbbibpybl2h88dsjsb"; + version = "0.5.8.5"; + sha256 = "0xynbxffjp44189zzqx30wabbrj83mvjl3mj1i5lag1h945yp1nk"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hinotify/default.nix b/pkgs/development/libraries/haskell/hinotify/default.nix index d33a294effd..5fac7a396ff 100644 --- a/pkgs/development/libraries/haskell/hinotify/default.nix +++ b/pkgs/development/libraries/haskell/hinotify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hint/default.nix b/pkgs/development/libraries/haskell/hint/default.nix index a29235d8512..aaec0f189c4 100644 --- a/pkgs/development/libraries/haskell/hint/default.nix +++ b/pkgs/development/libraries/haskell/hint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, extensibleExceptions, filepath, ghcMtl , ghcPaths, HUnit, mtl, random, utf8String }: diff --git a/pkgs/development/libraries/haskell/hit/default.nix b/pkgs/development/libraries/haskell/hit/default.nix index 7e5b30ebbad..bf92945d164 100644 --- a/pkgs/development/libraries/haskell/hit/default.nix +++ b/pkgs/development/libraries/haskell/hit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, bytedump, cryptohash, hourglass, HUnit, mtl , parsec, patience, QuickCheck, random, systemFileio , systemFilepath, testFramework, testFrameworkQuickcheck2, vector diff --git a/pkgs/development/libraries/haskell/hjsmin/default.nix b/pkgs/development/libraries/haskell/hjsmin/default.nix index 563372fa451..a9dc3064a23 100644 --- a/pkgs/development/libraries/haskell/hjsmin/default.nix +++ b/pkgs/development/libraries/haskell/hjsmin/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, Cabal, HUnit, languageJavascript , optparseApplicative, QuickCheck, testFramework , testFrameworkHunit, text @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hjsmin"; - version = "0.1.4.6"; - sha256 = "0z0wzgwm66ckq9h756s7srfyiv2jia9779yi86cn1zgzr8dwspvr"; + version = "0.1.4.7"; + sha256 = "1gw9is6piqrqxnrwp8v3vij90icmym58rxqnnklrcjfi3ai7y58f"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hledger-lib/default.nix b/pkgs/development/libraries/haskell/hledger-lib/default.nix index 5c0c94b2678..e91739a0970 100644 --- a/pkgs/development/libraries/haskell/hledger-lib/default.nix +++ b/pkgs/development/libraries/haskell/hledger-lib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, csv, filepath, HUnit, mtl, parsec, prettyShow , regexpr, regexTdfa, safe, split, testFramework , testFrameworkHunit, time, transformers, utf8String diff --git a/pkgs/development/libraries/haskell/hledger-web/default.nix b/pkgs/development/libraries/haskell/hledger-web/default.nix index 675e6b32fb5..70ba12e2398 100644 --- a/pkgs/development/libraries/haskell/hledger-web/default.nix +++ b/pkgs/development/libraries/haskell/hledger-web/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, blazeMarkup, clientsession, cmdargs , conduitExtra, dataDefault, filepath, hamlet, hjsmin, hledger , hledgerLib, hspec, httpClient, httpConduit, HUnit, json diff --git a/pkgs/development/libraries/haskell/hledger/default.nix b/pkgs/development/libraries/haskell/hledger/default.nix index 331e857ee14..52e7a070723 100644 --- a/pkgs/development/libraries/haskell/hledger/default.nix +++ b/pkgs/development/libraries/haskell/hledger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, csv, filepath, haskeline, hledgerLib, HUnit, mtl , parsec, prettyShow, regexpr, safe, shakespeare, shakespeareText , split, tabular, testFramework, testFrameworkHunit, text, time diff --git a/pkgs/development/libraries/haskell/hlibgit2/default.nix b/pkgs/development/libraries/haskell/hlibgit2/default.nix new file mode 100644 index 00000000000..7de2dd7dd87 --- /dev/null +++ b/pkgs/development/libraries/haskell/hlibgit2/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsDSL, git, openssl, zlib }: + +cabal.mkDerivation (self: { + pname = "hlibgit2"; + version = "0.18.0.13"; + sha256 = "1bslg51kkhnwm48kxaad4izq3xmzv6dpqy10a5kh16vr5zy3w5hz"; + buildDepends = [ bindingsDSL zlib ]; + testDepends = [ git ]; + extraLibraries = [ openssl ]; + meta = { + description = "Low-level bindings to libgit2"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hmatrix-special/default.nix b/pkgs/development/libraries/haskell/hmatrix-special/default.nix index 4e9fccbdcd8..3b07126ebc3 100644 --- a/pkgs/development/libraries/haskell/hmatrix-special/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix-special/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hmatrix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index bb0c48b9118..10d2aa69317 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, blas, deepseq, gsl, liblapack, random , storableComplex, vector }: diff --git a/pkgs/development/libraries/haskell/hoauth/default.nix b/pkgs/development/libraries/haskell/hoauth/default.nix index c568b292c3c..82cde2aead6 100644 --- a/pkgs/development/libraries/haskell/hoauth/default.nix +++ b/pkgs/development/libraries/haskell/hoauth/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptoPubkeyTypes, curl, dataenc, entropy, mtl , random, RSA, SHA, time, utf8String }: diff --git a/pkgs/development/libraries/haskell/hoauth2/default.nix b/pkgs/development/libraries/haskell/hoauth2/default.nix index fa0a913e181..4b5ecafdec8 100644 --- a/pkgs/development/libraries/haskell/hoauth2/default.nix +++ b/pkgs/development/libraries/haskell/hoauth2/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, bytestringShow, httpConduit, httpTypes , monadControl, mtl, random, text, transformers }: cabal.mkDerivation (self: { pname = "hoauth2"; - version = "0.4.0"; - sha256 = "1499rgcn3h4921x21s6l0spnjf3wvmsaa07pimgjgb4rjib3z2d5"; + version = "0.4.1"; + sha256 = "145lgy9bxx1xdljbkvi6s97n2z1k5fd0idp415r71ydw8h3i8ppx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/holy-project/default.nix b/pkgs/development/libraries/haskell/holy-project/default.nix index 4e751d9c003..09141bf6d0a 100644 --- a/pkgs/development/libraries/haskell/holy-project/default.nix +++ b/pkgs/development/libraries/haskell/holy-project/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, ansiTerminal, Cabal, filepath, hastache , httpConduit, HUnit, lens, QuickCheck, random, smallcheck, split , syb, tasty, tastyHunit, tastyQuickcheck, tastySmallcheck, text diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix index 2d7b60b6943..9e16fd34859 100644 --- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix @@ -1,14 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict +, text }: cabal.mkDerivation (self: { pname = "hoodle-builder"; - version = "0.2.2.0"; - sha256 = "0p123jpm39ggbjn1757nfygcgi324knin62cyggbq1hhhglkfxa2"; + version = "0.3"; + sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9"; buildDepends = [ - blazeBuilder doubleConversion hoodleTypes lens strict + blazeBuilder doubleConversion hoodleTypes lens strict text ]; - jailbreak = true; meta = { description = "text builder for hoodle file format"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix index f73733321be..d623df9b9f5 100644 --- a/pkgs/development/libraries/haskell/hoodle-core/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix @@ -1,26 +1,29 @@ -{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal -, configurator, coroutineObject, dbus, Diff, dyre, either, errors -, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser -, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl -, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm -, strict, svgcairo, systemFilepath, text, time, transformers -, transformersFree, uuid, xournalParser +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary +, cairo, cereal, configurator, coroutineObject, dbus, Diff, dyre +, either, errors, filepath, fsnotify, gd, gtk, hoodleBuilder +, hoodleParser, hoodleRender, hoodleTypes, lens, libX11, libXi +, monadLoops, mtl, network, networkInfo, networkSimple, pango +, poppler, pureMD5, stm, strict, svgcairo, systemFilepath, text +, time, transformers, transformersFree, unorderedContainers, uuid +, vector, xournalParser }: cabal.mkDerivation (self: { pname = "hoodle-core"; - version = "0.13.0.0"; - sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx"; + version = "0.14"; + sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8"; buildDepends = [ - attoparsec base64Bytestring binary cairo cereal configurator - coroutineObject dbus Diff dyre either errors filepath fsnotify gd - gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens - monadLoops mtl network networkInfo networkSimple pango poppler + aeson aesonPretty attoparsec base64Bytestring binary cairo cereal + configurator coroutineObject dbus Diff dyre either errors filepath + fsnotify gd gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes + lens monadLoops mtl network networkInfo networkSimple pango poppler pureMD5 stm strict svgcairo systemFilepath text time transformers - transformersFree uuid xournalParser + transformersFree unorderedContainers uuid vector xournalParser ]; extraLibraries = [ libX11 libXi ]; - jailbreak = true; + noHaddock = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Core library for hoodle"; diff --git a/pkgs/development/libraries/haskell/hoodle-extra/default.nix b/pkgs/development/libraries/haskell/hoodle-extra/default.nix new file mode 100644 index 00000000000..d9d5c6a6130 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-extra/default.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary +, cmdargs, conduit, either, filepath, hoodleParser, hoodleTypes +, httpConduit, lens, monadLoops, mtl, networkSimple, pureMD5 +, resourcet, text, time, transformers, unorderedContainers +, xournalParser +}: + +cabal.mkDerivation (self: { + pname = "hoodle-extra"; + version = "0.1"; + sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec base64Bytestring binary cmdargs + conduit either filepath hoodleParser hoodleTypes httpConduit lens + monadLoops mtl networkSimple pureMD5 resourcet text time + transformers unorderedContainers xournalParser + ]; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "extra hoodle tools"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix index 84d9e93aaa2..86800e6efd5 100644 --- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix @@ -1,16 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text , transformers, xournalTypes }: cabal.mkDerivation (self: { pname = "hoodle-parser"; - version = "0.2.2"; - sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm"; + version = "0.3"; + sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i"; buildDepends = [ attoparsec either hoodleTypes lens mtl strict text transformers xournalTypes ]; - jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Hoodle file parser"; diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix index 3666ef91398..c3cec26802c 100644 --- a/pkgs/development/libraries/haskell/hoodle-render/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix @@ -1,19 +1,22 @@ -{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens -, monadLoops, mtl, poppler, strict, svgcairo, uuid +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, base64Bytestring, cairo, filepath, gd, gtk, hoodleTypes +, lens, monadLoops, mtl, poppler, stm, strict, svgcairo +, transformers, unorderedContainers, uuid }: cabal.mkDerivation (self: { pname = "hoodle-render"; - version = "0.3.2"; - sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg"; + version = "0.4"; + sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d"; buildDepends = [ - base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl - poppler strict svgcairo uuid + base64Bytestring cairo filepath gd gtk hoodleTypes lens monadLoops + mtl poppler stm strict svgcairo transformers unorderedContainers + uuid ]; - jailbreak = true; meta = { description = "Hoodle file renderer"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; }; diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix index 55d75231510..745e2c575b8 100644 --- a/pkgs/development/libraries/haskell/hoodle-types/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix @@ -1,11 +1,12 @@ -{ cabal, cereal, lens, mtl, strict, uuid }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, lens, mtl, strict, text, uuid }: cabal.mkDerivation (self: { pname = "hoodle-types"; - version = "0.2.2"; - sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz"; - buildDepends = [ cereal lens mtl strict uuid ]; - jailbreak = true; + version = "0.3"; + sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm"; + buildDepends = [ cereal lens mtl strict text uuid ]; meta = { description = "Data types for programs for hoodle file format"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/default.nix index 624cc931981..5da81ff1127 100644 --- a/pkgs/development/libraries/haskell/hoogle/default.nix +++ b/pkgs/development/libraries/haskell/hoogle/default.nix @@ -1,14 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp -, fetchurl }: cabal.mkDerivation (self: { pname = "hoogle"; - version = "4.2.32"; - sha256 = "1rhr7xh4x9fgflcszbsl176r8jq6rm81bwzmbz73f3pa1zf1v0zc"; + version = "4.2.34"; + sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,9 +20,6 @@ cabal.mkDerivation (self: { ]; testDepends = [ filepath ]; testTarget = "--test-option=--no-net"; - patches = [ (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; - sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) - ]; meta = { homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; diff --git a/pkgs/development/libraries/haskell/hoogle/local.nix b/pkgs/development/libraries/haskell/hoogle/local.nix index 9f56d028c59..67f38f260e0 100644 --- a/pkgs/development/libraries/haskell/hoogle/local.nix +++ b/pkgs/development/libraries/haskell/hoogle/local.nix @@ -27,6 +27,7 @@ , cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes , parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text , time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +, fetchurl , parallel, perl, wget, rehoo, haskellPlatform , packages ? haskellPlatform.propagatedUserEnvPkgs @@ -51,7 +52,10 @@ cabal.mkDerivation (self: rec { # The tests will fail because of the added documentation. doCheck = false; - patches = [ ./hoogle-local.diff ]; + patches = [ ./hoogle-local.diff + (fetchurl { url = "https://github.com/ndmitchell/hoogle/commit/5fc294f2b5412fda107c7700f4d833b52f26184c.diff"; + sha256 = "1fn52g90p2jsy87gf5rqrcg49s8hfwway5hi4v9i2rpg5mzxaq3i"; }) + ]; docPackages = packages; diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix index b65abe6aa3e..10834ef5f2c 100644 --- a/pkgs/development/libraries/haskell/hopenssl/default.nix +++ b/pkgs/development/libraries/haskell/hopenssl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, openssl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hostname/default.nix b/pkgs/development/libraries/haskell/hostname/default.nix index 75886f8daad..ea29d2a3b7b 100644 --- a/pkgs/development/libraries/haskell/hostname/default.nix +++ b/pkgs/development/libraries/haskell/hostname/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index f7569ba3fa5..5b11121a9ef 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, mtl, tasty, tastyHunit, tastyQuickcheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hp2any-core/default.nix b/pkgs/development/libraries/haskell/hp2any-core/default.nix index 96ac397da79..7cf55bd9ef5 100644 --- a/pkgs/development/libraries/haskell/hp2any-core/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, filepath, network, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hp2any-graph/default.nix b/pkgs/development/libraries/haskell/hp2any-graph/default.nix index 83369ac008b..e6607c4e0af 100644 --- a/pkgs/development/libraries/haskell/hp2any-graph/default.nix +++ b/pkgs/development/libraries/haskell/hp2any-graph/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, freeglut, GLUT, hp2anyCore, mesa, network , OpenGL, parseargs }: cabal.mkDerivation (self: { pname = "hp2any-graph"; - version = "0.5.4"; - sha256 = "1lhp9saw51w09fhk94hz31rjawnnxavd7x3lxjc8xn1778wp3v9h"; + version = "0.5.4.1"; + sha256 = "0cvli36lbipi29fw45mfpv35dn7ndbkxhpd3wjy9xn9gy8g0r9xx"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hs-bibutils/default.nix b/pkgs/development/libraries/haskell/hs-bibutils/default.nix index adf136cd898..3dfaca25e88 100644 --- a/pkgs/development/libraries/haskell/hs-bibutils/default.nix +++ b/pkgs/development/libraries/haskell/hs-bibutils/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hsdns/default.nix b/pkgs/development/libraries/haskell/hsdns/default.nix index 464047d0c61..1e7b4164ff5 100644 --- a/pkgs/development/libraries/haskell/hsdns/default.nix +++ b/pkgs/development/libraries/haskell/hsdns/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, adns, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hse-cpp/default.nix b/pkgs/development/libraries/haskell/hse-cpp/default.nix index 1d7494308bd..7762191f53e 100644 --- a/pkgs/development/libraries/haskell/hse-cpp/default.nix +++ b/pkgs/development/libraries/haskell/hse-cpp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs, haskellSrcExts }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hsemail/default.nix b/pkgs/development/libraries/haskell/hsemail/default.nix index e9822f75829..17203b07ef1 100644 --- a/pkgs/development/libraries/haskell/hsemail/default.nix +++ b/pkgs/development/libraries/haskell/hsemail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, hspec, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index fdb3304ccd8..b125dbcef64 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, cmdargs, filepath, haskellSrcExts, lens, mtl , split, tasty, tastyGolden, text }: diff --git a/pkgs/development/libraries/haskell/hsini/default.nix b/pkgs/development/libraries/haskell/hsini/default.nix index 52d8a26c92a..5fd6f5afd80 100644 --- a/pkgs/development/libraries/haskell/hsini/default.nix +++ b/pkgs/development/libraries/haskell/hsini/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, parsec, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh }: diff --git a/pkgs/development/libraries/haskell/hslogger-template/default.nix b/pkgs/development/libraries/haskell/hslogger-template/default.nix index be78bea938c..a8efff1b6c8 100644 --- a/pkgs/development/libraries/haskell/hslogger-template/default.nix +++ b/pkgs/development/libraries/haskell/hslogger-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hslogger, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hslua/default.nix b/pkgs/development/libraries/haskell/hslua/default.nix index c528c22bdfb..980de57605d 100644 --- a/pkgs/development/libraries/haskell/hslua/default.nix +++ b/pkgs/development/libraries/haskell/hslua/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lua, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix b/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix new file mode 100644 index 00000000000..7b9c9dfd402 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-attoparsec/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, hspec, hspecExpectations, text }: + +cabal.mkDerivation (self: { + pname = "hspec-attoparsec"; + version = "0.1.0.1"; + sha256 = "12246p4k0axv6w5jxnid9hyl4cbl3vmd46b7xxli7nq2iw79nl8v"; + buildDepends = [ attoparsec hspecExpectations text ]; + testDepends = [ attoparsec hspec hspecExpectations text ]; + meta = { + homepage = "http://github.com/alpmestan/hspec-attoparsec"; + description = "Utility functions for testing your attoparsec parsers with hspec"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix index 9ea5ff57efc..12ac56702df 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations-lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, hspecExpectations, HUnit, lens, silently }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hspec-expectations/default.nix b/pkgs/development/libraries/haskell/hspec-expectations/default.nix index 5a146265751..7706fbca50f 100644 --- a/pkgs/development/libraries/haskell/hspec-expectations/default.nix +++ b/pkgs/development/libraries/haskell/hspec-expectations/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, markdownUnlit, silently }: cabal.mkDerivation (self: { pname = "hspec-expectations"; - version = "0.5.0.1"; - sha256 = "0r1yy94q30gp3wyif7qfa22gn3g2lrszwygsy4wknc396fab7mvj"; + version = "0.6.0.1"; + sha256 = "16013x7v6zly4h1spzarrlzskbjb19bljsj98fn8k21mzb82f7wl"; buildDepends = [ HUnit ]; testDepends = [ hspec HUnit markdownUnlit silently ]; doCheck = false; diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index dbc6369dc7e..f361d2cf865 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, deepseq, filepath, hspecExpectations , HUnit, QuickCheck, quickcheckIo, random, setenv, tfRandom, time , transformers @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.10.0"; - sha256 = "1x32wgrd1i6rs6790dbr51j9g6abjpcf951cx3nmm4zdcwblyi6a"; + version = "1.11.0"; + sha256 = "1gsczyzxavd3abrq5p0qdxb92z6v3jhicqa40ihgfy89x3pp6bw8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 639aa484dfa..19a2cb91808 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, aesonQq, caseInsensitive, doctest, hspec2 , hspecMeta, httpTypes, markdownUnlit, scotty, text, transformers , wai, waiExtra diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index c0f5e4c1468..e332e5279ef 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo , random, setenv, silently, tfRandom, time, transformers @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.10.0"; - sha256 = "0lqc4sxl2c1rgnmp4a2fikc78f9caxswkmxfi8wajxlwaj58sy8p"; + version = "1.11.0"; + sha256 = "1hkflasm7w9z0b1c1mq3rl5pq05np27sz3p2s61bick371qi9zsf"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 144e327b179..9fa76dc9b4f 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, deepseq, doctest, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo , random, setenv, silently, tfRandom, time, transformers @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.3.4"; - sha256 = "0vs5y1cqprixmmjdk3sdrig9gr1k63nvn4c91b3z66jj39rdxl21"; + version = "0.4.0"; + sha256 = "0x5y77qa33gx1shqhzdkdp0732lpkihvp5wh4826scg229haj5v5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspread/default.nix b/pkgs/development/libraries/haskell/hspread/default.nix index dbd1a4a0923..843baec0e8c 100644 --- a/pkgs/development/libraries/haskell/hspread/default.nix +++ b/pkgs/development/libraries/haskell/hspread/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, extensibleExceptions, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hsshellscript/default.nix b/pkgs/development/libraries/haskell/hsshellscript/default.nix index 126a0d316bf..b6fdac69544 100644 --- a/pkgs/development/libraries/haskell/hsshellscript/default.nix +++ b/pkgs/development/libraries/haskell/hsshellscript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, parsec, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hstatsd/default.nix b/pkgs/development/libraries/haskell/hstatsd/default.nix index 91a6159784a..d19d7b38829 100644 --- a/pkgs/development/libraries/haskell/hstatsd/default.nix +++ b/pkgs/development/libraries/haskell/hstatsd/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index 552ed94c962..dcb451730d4 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/html-conduit/default.nix b/pkgs/development/libraries/haskell/html-conduit/default.nix index 49a7d37e4aa..4d13846175c 100644 --- a/pkgs/development/libraries/haskell/html-conduit/default.nix +++ b/pkgs/development/libraries/haskell/html-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, hspec, HUnit, resourcet , systemFilepath, tagstreamConduit, text, transformers, xmlConduit , xmlTypes diff --git a/pkgs/development/libraries/haskell/html/1.0.1.2.nix b/pkgs/development/libraries/haskell/html/1.0.1.2.nix index de8dc75a5fa..dc2340db6e2 100644 --- a/pkgs/development/libraries/haskell/html/1.0.1.2.nix +++ b/pkgs/development/libraries/haskell/html/1.0.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/http-attoparsec/default.nix b/pkgs/development/libraries/haskell/http-attoparsec/default.nix index 47ecc46b63f..56043e385c5 100644 --- a/pkgs/development/libraries/haskell/http-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/http-attoparsec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, httpTypes }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/http-client-conduit/default.nix b/pkgs/development/libraries/haskell/http-client-conduit/default.nix index 019136e47ca..60c7b3c6850 100644 --- a/pkgs/development/libraries/haskell/http-client-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-client-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, httpClient }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/http-client-multipart/default.nix b/pkgs/development/libraries/haskell/http-client-multipart/default.nix index 9cad23a7999..1e51404ebb0 100644 --- a/pkgs/development/libraries/haskell/http-client-multipart/default.nix +++ b/pkgs/development/libraries/haskell/http-client-multipart/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, httpClient }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/http-client-tls/default.nix b/pkgs/development/libraries/haskell/http-client-tls/default.nix index 5ec8eecd06c..ca4dbbe1085 100644 --- a/pkgs/development/libraries/haskell/http-client-tls/default.nix +++ b/pkgs/development/libraries/haskell/http-client-tls/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, connection, dataDefaultClass, hspec, httpClient, httpTypes , network, tls }: cabal.mkDerivation (self: { pname = "http-client-tls"; - version = "0.2.1.1"; - sha256 = "07kwcamc100y48gghmlfvj5ycf6y3cynqqg5kx0ymgjk85k7vim7"; + version = "0.2.2"; + sha256 = "0a01r05h5fxswyn6k6cgqgak4scqjan72hyy5wbdqzzhl4rmh7j5"; buildDepends = [ connection dataDefaultClass httpClient network tls ]; diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index be261bf6027..acd93b29e18 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, base64Bytestring, blazeBuilder, caseInsensitive , cookie, dataDefaultClass, deepseq, exceptions, filepath, hspec , httpTypes, mimeTypes, monadControl, network, publicsuffixlist @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.3.3.1"; - sha256 = "0zzh4vr563f8rb51b64gcwmal7gswif8ndsf2x5kw6f7q55md0dw"; + version = "0.3.6"; + sha256 = "0zav8arj6swhrzfyxf6py2yfpphjd0bllz7rm1540vb5lrhg4znm"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/http-common/default.nix b/pkgs/development/libraries/haskell/http-common/default.nix index 8b0f15d136b..da60083936c 100644 --- a/pkgs/development/libraries/haskell/http-common/default.nix +++ b/pkgs/development/libraries/haskell/http-common/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, caseInsensitive, mtl , network, text, transformers, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 918993e6be8..bd8be746b04 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, caseInsensitive, conduit, conduitExtra , connection, cookie, dataDefaultClass, hspec, httpClient , httpClientTls, httpTypes, HUnit, liftedBase, monadControl, mtl @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.2.1"; - sha256 = "17bq72qkgn7sh31ad5w7gqf15dlzl027nmx8k7kmm268mf9bz0b5"; + version = "2.1.4"; + sha256 = "14xfd25y7r2lhg7dx9hfniihgyzhkz4c6642k5pr27fqjjlr6ijb"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers diff --git a/pkgs/development/libraries/haskell/http-date/default.nix b/pkgs/development/libraries/haskell/http-date/default.nix index 3571c160f6b..b09029070b9 100644 --- a/pkgs/development/libraries/haskell/http-date/default.nix +++ b/pkgs/development/libraries/haskell/http-date/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, doctest, hspec, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/http-kit/default.nix b/pkgs/development/libraries/haskell/http-kit/default.nix index 18a0468d836..63d6d68745c 100644 --- a/pkgs/development/libraries/haskell/http-kit/default.nix +++ b/pkgs/development/libraries/haskell/http-kit/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, caseInsensitive, hspec, httpTypes, QuickCheck , quickcheckInstances }: cabal.mkDerivation (self: { pname = "http-kit"; - version = "0.5.0"; - sha256 = "0djg2gg12w9sd598hx959cgr5027ghza3m6aaym9ipb43w6mds5p"; + version = "0.5.1"; + sha256 = "1swnvsbaabk946pys9q9kr0bgdvalnznd59dw981sg7cywqdcz28"; buildDepends = [ caseInsensitive httpTypes ]; testDepends = [ hspec httpTypes QuickCheck quickcheckInstances ]; meta = { diff --git a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix index 170d15aa707..c2316799a03 100644 --- a/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix +++ b/pkgs/development/libraries/haskell/http-reverse-proxy/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, blazeBuilder, caseInsensitive, conduit , conduitExtra, dataDefaultClass, hspec, httpClient, httpConduit , httpTypes, liftedBase, monadControl, network, networkConduit diff --git a/pkgs/development/libraries/haskell/http-streams/default.nix b/pkgs/development/libraries/haskell/http-streams/default.nix index a2c2bc6f8c0..910851bde34 100644 --- a/pkgs/development/libraries/haskell/http-streams/default.nix +++ b/pkgs/development/libraries/haskell/http-streams/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, aesonPretty, attoparsec, base64Bytestring , blazeBuilder, caseInsensitive, HsOpenSSL, hspec , hspecExpectations, httpCommon, HUnit, ioStreams @@ -8,8 +10,8 @@ cabal.mkDerivation (self: { pname = "http-streams"; - version = "0.7.1.1"; - sha256 = "0wh07gdb9w48mwsjvg07dq6gjvdm8ls654ki180r7p38v93rsmfx"; + version = "0.7.2.0"; + sha256 = "0h7fjnpday34skhafv2v0ybhfv0x915prfb4qa0ld4gm50scsinz"; buildDepends = [ aeson attoparsec base64Bytestring blazeBuilder caseInsensitive HsOpenSSL httpCommon ioStreams mtl network opensslStreams text diff --git a/pkgs/development/libraries/haskell/http-types/default.nix b/pkgs/development/libraries/haskell/http-types/default.nix index 4b1a7b956f6..f8e8759cd47 100644 --- a/pkgs/development/libraries/haskell/http-types/default.nix +++ b/pkgs/development/libraries/haskell/http-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, caseInsensitive, doctest, hspec, QuickCheck , quickcheckInstances, text }: diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 2ebb8902617..ff395a4f8c2 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix new file mode 100644 index 00000000000..1ce64baa09c --- /dev/null +++ b/pkgs/development/libraries/haskell/hweblib/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, HUnit, mtl, text, transformers }: + +cabal.mkDerivation (self: { + pname = "hweblib"; + version = "0.6.3"; + sha256 = "03dmx5irlsyb3b9zg2r6nz947sslizkn0nlk65ldb5n4m8my33hy"; + buildDepends = [ attoparsec mtl text transformers ]; + testDepends = [ attoparsec HUnit mtl transformers ]; + meta = { + homepage = "http://github.com/aycanirican/hweblib"; + description = "Haskell Web Library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix index 500ed430783..00b267ff14e 100644 --- a/pkgs/development/libraries/haskell/hxt-charproperties/default.nix +++ b/pkgs/development/libraries/haskell/hxt-charproperties/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hxt-http/default.nix b/pkgs/development/libraries/haskell/hxt-http/default.nix index 14867df7fc1..e85e0ae0a87 100644 --- a/pkgs/development/libraries/haskell/hxt-http/default.nix +++ b/pkgs/development/libraries/haskell/hxt-http/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, hxt, network, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix new file mode 100644 index 00000000000..60b43b0bad4 --- /dev/null +++ b/pkgs/development/libraries/haskell/hxt-pickle-utils/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hxt, mtl }: + +cabal.mkDerivation (self: { + pname = "hxt-pickle-utils"; + version = "0.1.0.2"; + sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2"; + buildDepends = [ hxt mtl ]; + meta = { + homepage = "https://github.com/silkapp/hxt-pickle-utils"; + description = "Utility functions for using HXT picklers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index 879ff0affdc..a02074a22ee 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hxtCharproperties, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix b/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix index 431e6e85c13..efbbb3b4e4b 100644 --- a/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/hxt-tagsoup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hxt, hxtCharproperties, hxtUnicode, tagsoup }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hxt-unicode/default.nix b/pkgs/development/libraries/haskell/hxt-unicode/default.nix index 55017c4193e..29ada817a23 100644 --- a/pkgs/development/libraries/haskell/hxt-unicode/default.nix +++ b/pkgs/development/libraries/haskell/hxt-unicode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hxtCharproperties }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hxt-xpath/default.nix b/pkgs/development/libraries/haskell/hxt-xpath/default.nix index 73e350bd77b..9176d085859 100644 --- a/pkgs/development/libraries/haskell/hxt-xpath/default.nix +++ b/pkgs/development/libraries/haskell/hxt-xpath/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hxt, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 440be70a60b..92f577c40cc 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, deepseq, filepath, HUnit, hxtCharproperties , hxtRegexXmlschema, hxtUnicode, mtl, network, parsec }: diff --git a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix index 0ad23b69437..ccbc4ed7b11 100644 --- a/pkgs/development/libraries/haskell/hybrid-vectors/default.nix +++ b/pkgs/development/libraries/haskell/hybrid-vectors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix index e877e8d8d50..fa3be575f68 100644 --- a/pkgs/development/libraries/haskell/iCalendar/default.nix +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl , network, parsec, text, time }: diff --git a/pkgs/development/libraries/haskell/idna/default.nix b/pkgs/development/libraries/haskell/idna/default.nix index 125083de890..a3b1144755d 100644 --- a/pkgs/development/libraries/haskell/idna/default.nix +++ b/pkgs/development/libraries/haskell/idna/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, punycode, stringprep, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ieee754/default.nix b/pkgs/development/libraries/haskell/ieee754/default.nix index 6eb5f262516..dd6f7e8d2b9 100644 --- a/pkgs/development/libraries/haskell/ieee754/default.nix +++ b/pkgs/development/libraries/haskell/ieee754/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/imm/default.nix b/pkgs/development/libraries/haskell/imm/default.nix index 38bc9bbfde7..24a96ba028a 100644 --- a/pkgs/development/libraries/haskell/imm/default.nix +++ b/pkgs/development/libraries/haskell/imm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, caseInsensitive, cond, dataDefault, dyre, feed , filepath, hslogger, httpConduit, httpTypes, lens, mimeMail , monadControl, mtl, network, opml, random, resourcet, text @@ -9,7 +11,6 @@ cabal.mkDerivation (self: { pname = "imm"; version = "0.6.0.1"; sha256 = "11m6937wafl6nic69mbibrjnxib503907y21n9zmsxc8vnjl3pps"; - patches = [ ./latest-feed-http-conduit-tls.patch ]; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22,6 +23,5 @@ cabal.mkDerivation (self: { description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir"; license = "unknown"; platforms = self.ghc.meta.platforms; - maintainers = [ "Daniel Bergey <bergey@teallabs.org>" ]; }; -}) \ No newline at end of file +}) diff --git a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch b/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch deleted file mode 100644 index afe72bc83e7..00000000000 --- a/pkgs/development/libraries/haskell/imm/latest-feed-http-conduit-tls.patch +++ /dev/null @@ -1,73 +0,0 @@ -# HG changeset patch -# User Daniel Bergey <bergey@alum.mit.edu> -# Date 1398284724 0 -# Wed Apr 23 20:25:24 2014 +0000 -# Node ID 4cc692e7acc4f21ffab9e5572d286495791d22d1 -# Parent 31e3ba1aaaf9efdce66e8ef5c192d0f4214150f4 -Update for feed-0.3.9.2, http-conduit-2.0, tls-1.2 - -diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/Error.hs ---- a/Imm/Error.hs Sun Jun 16 12:23:40 2013 +0200 -+++ b/Imm/Error.hs Wed Apr 23 20:25:24 2014 +0000 -@@ -41,7 +41,7 @@ - data ImmError = - OtherError String - | HTTPError HttpException -- | TLSError HandshakeFailed -+ | TLSError TLSException - | UnicodeError UnicodeException - | ParseUriError String - | ParseTimeError String -@@ -63,7 +63,7 @@ - "/!\\ Cannot parse date from item: ", - " title: " ++ (show $ getItemTitle item), - " link:" ++ (show $ getItemLink item), -- " publish date:" ++ (show $ getItemPublishDate item), -+ " publish date:" ++ (show (getItemPublishDate item :: Maybe (Maybe UTCTime))), - " date:" ++ (show $ getItemDate item)] - show (ParseTimeError raw) = "/!\\ Cannot parse time: " ++ raw - show (ParseFeedError raw) = "/!\\ Cannot parse feed: " ++ raw -diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 Imm/HTTP.hs ---- a/Imm/HTTP.hs Sun Jun 16 12:23:40 2013 +0200 -+++ b/Imm/HTTP.hs Wed Apr 23 20:25:24 2014 +0000 -@@ -50,13 +50,13 @@ - either throwError return res - - -- | Monad-agnostic version of 'parseUrl' --parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request m') -+parseURL :: (MonadBase IO m, MonadError ImmError m) => String -> m Request - parseURL uri = do - result <- io $ (Right <$> parseUrl uri) `catch` (return . Left . HTTPError) - either throwError return result - - -- | Build an HTTP request for given URI --request :: (MonadBase IO m, MonadError ImmError m) => String -> m (Request a) -+request :: (MonadBase IO m, MonadError ImmError m) => String -> m Request - request uri = do - req <- parseURL uri - return $ req { requestHeaders = [ -diff -r 31e3ba1aaaf9 -r 4cc692e7acc4 imm.cabal ---- a/imm.cabal Sun Jun 16 12:23:40 2013 +0200 -+++ b/imm.cabal Wed Apr 23 20:25:24 2014 +0000 -@@ -46,10 +46,10 @@ - data-default, - directory, - dyre, -- feed, -+ feed == 0.3.9.2, - filepath, - hslogger, -- http-conduit >= 1.9.0, -+ http-conduit >= 2.0 && < 2.2, - http-types, - lens, - mime-mail, -@@ -66,7 +66,7 @@ - transformers, - time, - timerep >= 1.0.3, -- tls, -+ tls >= 1.2 && < 1.3, - utf8-string, - xdg-basedir, - xml diff --git a/pkgs/development/libraries/haskell/indents/default.nix b/pkgs/development/libraries/haskell/indents/default.nix index 84a19f541ee..111268cc9f3 100644 --- a/pkgs/development/libraries/haskell/indents/default.nix +++ b/pkgs/development/libraries/haskell/indents/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, concatenative, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/indexed-free/default.nix b/pkgs/development/libraries/haskell/indexed-free/default.nix index 557154d391a..60d3330239e 100644 --- a/pkgs/development/libraries/haskell/indexed-free/default.nix +++ b/pkgs/development/libraries/haskell/indexed-free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, indexed }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/indexed/default.nix b/pkgs/development/libraries/haskell/indexed/default.nix index c31fa6691d8..f1c1c1fba4e 100644 --- a/pkgs/development/libraries/haskell/indexed/default.nix +++ b/pkgs/development/libraries/haskell/indexed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 8337fe51655..7a4b6ca38ac 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/interlude/default.nix b/pkgs/development/libraries/haskell/interlude/default.nix index 71b875ba791..c4c0ae2a1df 100644 --- a/pkgs/development/libraries/haskell/interlude/default.nix +++ b/pkgs/development/libraries/haskell/interlude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index 6b0ee4b6e36..eed6aa835f8 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, haskellSrcMeta, hspec, QuickCheck , quickcheckInstances, text }: cabal.mkDerivation (self: { pname = "interpolate"; - version = "0.0.2"; - sha256 = "0l9hrgwmvp7h2mgw90gk45zgp0yy00201ki9hwg26sh2wd0sj6f8"; + version = "0.0.3"; + sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw"; buildDepends = [ haskellSrcMeta ]; testDepends = [ doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text diff --git a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix index 63ea81058e5..b24a79e62d9 100644 --- a/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix +++ b/pkgs/development/libraries/haskell/interpolatedstring-perl6/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcMeta, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix index 73e1d2d7197..962f30de8a0 100644 --- a/pkgs/development/libraries/haskell/intervals/default.nix +++ b/pkgs/development/libraries/haskell/intervals/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, distributive, doctest, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/io-choice/default.nix b/pkgs/development/libraries/haskell/io-choice/default.nix index 4cceb87c97e..5a88300ace7 100644 --- a/pkgs/development/libraries/haskell/io-choice/default.nix +++ b/pkgs/development/libraries/haskell/io-choice/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, liftedBase, monadControl, transformers , transformersBase }: diff --git a/pkgs/development/libraries/haskell/io-memoize/default.nix b/pkgs/development/libraries/haskell/io-memoize/default.nix index 3343ee9cbe9..625d689cd40 100644 --- a/pkgs/development/libraries/haskell/io-memoize/default.nix +++ b/pkgs/development/libraries/haskell/io-memoize/default.nix @@ -1,11 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async }: cabal.mkDerivation (self: { pname = "io-memoize"; - version = "1.1.0.0"; - sha256 = "1xnrzrvs5c3lrzdxm4hrqbh8chl8sxv2j98b28na73w8b7yv2agm"; + version = "1.1.1.0"; + sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7"; buildDepends = [ async ]; meta = { + homepage = "https://github.com/DanBurton/io-memoize"; description = "Memoize IO actions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/io-storage/default.nix b/pkgs/development/libraries/haskell/io-storage/default.nix index 32e60325acc..7380dc0d414 100644 --- a/pkgs/development/libraries/haskell/io-storage/default.nix +++ b/pkgs/development/libraries/haskell/io-storage/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 864c0cdddae..633389a0a3f 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, filepath, HUnit, mtl , network, primitive, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, text, time, transformers, vector, zlib diff --git a/pkgs/development/libraries/haskell/ipprint/default.nix b/pkgs/development/libraries/haskell/ipprint/default.nix index e648ae19c3d..d9037a8229b 100644 --- a/pkgs/development/libraries/haskell/ipprint/default.nix +++ b/pkgs/development/libraries/haskell/ipprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Extra, haskellSrc }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/iproute/default.nix b/pkgs/development/libraries/haskell/iproute/default.nix index 89a57614160..2aa33e9b441 100644 --- a/pkgs/development/libraries/haskell/iproute/default.nix +++ b/pkgs/development/libraries/haskell/iproute/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, appar, byteorder, doctest, hspec, network, QuickCheck , safe }: cabal.mkDerivation (self: { pname = "iproute"; - version = "1.2.12"; - sha256 = "19pr6my4nw7qq9lsp6xvz55lm9svwzqka5qcqy79sfdkxg459rg5"; + version = "1.3.0"; + sha256 = "1n9lcm1f2rlqkvg90zikf2h4badzh9r24zqb27648l48254m6q5p"; buildDepends = [ appar byteorder network ]; testDepends = [ appar byteorder doctest hspec network QuickCheck safe diff --git a/pkgs/development/libraries/haskell/irc/default.nix b/pkgs/development/libraries/haskell/irc/default.nix index 49f732e857c..c2ba34c880a 100644 --- a/pkgs/development/libraries/haskell/irc/default.nix +++ b/pkgs/development/libraries/haskell/irc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix index f0772ca4db1..419bc590f5e 100644 --- a/pkgs/development/libraries/haskell/iteratee/default.nix +++ b/pkgs/development/libraries/haskell/iteratee/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, HUnit, ListLike, monadControl, mtl, parallel , QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, transformersBase diff --git a/pkgs/development/libraries/haskell/ivor/default.nix b/pkgs/development/libraries/haskell/ivor/default.nix index d062ec29869..901328080e3 100644 --- a/pkgs/development/libraries/haskell/ivor/default.nix +++ b/pkgs/development/libraries/haskell/ivor/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ix-shapable/default.nix b/pkgs/development/libraries/haskell/ix-shapable/default.nix index 056e308b4ac..965257832e0 100644 --- a/pkgs/development/libraries/haskell/ix-shapable/default.nix +++ b/pkgs/development/libraries/haskell/ix-shapable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix index 8e4a92f6dca..25b4ebed648 100644 --- a/pkgs/development/libraries/haskell/ixdopp/default.nix +++ b/pkgs/development/libraries/haskell/ixdopp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, preprocessorTools, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix new file mode 100644 index 00000000000..c77950c68f0 --- /dev/null +++ b/pkgs/development/libraries/haskell/ixset/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, safecopy, syb, sybWithClass }: + +cabal.mkDerivation (self: { + pname = "ixset"; + version = "1.0.5"; + sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns"; + buildDepends = [ safecopy syb sybWithClass ]; + meta = { + homepage = "http://happstack.com"; + description = "Efficient relational queries on Haskell sets"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/jack/default.nix b/pkgs/development/libraries/haskell/jack/default.nix index 3b8be28e790..2e6b6ee1aa3 100644 --- a/pkgs/development/libraries/haskell/jack/default.nix +++ b/pkgs/development/libraries/haskell/jack/default.nix @@ -1,17 +1,19 @@ -{ cabal, enumset, eventList, explicitException, jackaudio, midi +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, enumset, eventList, explicitException, jack2, midi , nonNegative, transformers }: cabal.mkDerivation (self: { pname = "jack"; - version = "0.7.0.2"; - sha256 = "06mf1sw1lp81b3d4hsgc199m30drdnxzzlmsxg4p1yvydjfdk4gj"; + version = "0.7.0.3"; + sha256 = "12ap7xcgzmp5zwmqkwsgxplh5li21m7xngijr4mhnn9y33xc1lrk"; isLibrary = true; isExecutable = true; buildDepends = [ enumset eventList explicitException midi nonNegative transformers ]; - pkgconfigDepends = [ jackaudio ]; + pkgconfigDepends = [ jack2 ]; meta = { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix new file mode 100644 index 00000000000..c8c7c503ea9 --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro-rpc-happstack/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, blazeHtml, happstackServer, jmacro, jmacroRpc, mtl +}: + +cabal.mkDerivation (self: { + pname = "jmacro-rpc-happstack"; + version = "0.3"; + sha256 = "0z24iqq0nmvm4x4fz4vl1rsccqnaynhmza502im967y7lials9wa"; + buildDepends = [ + aeson blazeHtml happstackServer jmacro jmacroRpc mtl + ]; + meta = { + homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; + description = "Happstack backend for jmacro-rpc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix new file mode 100644 index 00000000000..9ff082e3239 --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro-rpc-snap/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, jmacro, jmacroRpc, mtl, snapCore }: + +cabal.mkDerivation (self: { + pname = "jmacro-rpc-snap"; + version = "0.3"; + sha256 = "1syzx2lw4r8knsqhsvilp04wb8a718379cmn0nhjqlwhpaja9bj8"; + buildDepends = [ aeson jmacro jmacroRpc mtl snapCore ]; + meta = { + homepage = "http://hub.darcs.net/gershomb/jmacro-rpc"; + description = "Snap backend for jmacro-rpc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/jmacro-rpc/default.nix b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix new file mode 100644 index 00000000000..d1e302b1bc9 --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro-rpc/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, blazeHtml, contravariant, jmacro, mtl +, scientific, split, text, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "jmacro-rpc"; + version = "0.3"; + sha256 = "1fkcky2f51764xcbbwnxpxyhk2mmnp364hf8njfcjsijanv938zw"; + buildDepends = [ + aeson attoparsec blazeHtml contravariant jmacro mtl scientific + split text unorderedContainers vector + ]; + meta = { + homepage = "http://hub.darcs.net/gershomb/jmacro"; + description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/jmacro/default.nix b/pkgs/development/libraries/haskell/jmacro/default.nix new file mode 100644 index 00000000000..32d4d3747ef --- /dev/null +++ b/pkgs/development/libraries/haskell/jmacro/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, haskellSrcExts, haskellSrcMeta, mtl, parseargs +, parsec, regexPosix, safe, syb, text, unorderedContainers, vector +, wlPprintText +}: + +cabal.mkDerivation (self: { + pname = "jmacro"; + version = "0.6.9"; + sha256 = "1prplflikryw7scz75rbijn4dl1gdi6589yq5902n26xpaigqsp6"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson haskellSrcExts haskellSrcMeta mtl parseargs parsec regexPosix + safe syb text unorderedContainers vector wlPprintText + ]; + meta = { + description = "QuasiQuotation library for programmatic generation of Javascript code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/jpeg/default.nix b/pkgs/development/libraries/haskell/jpeg/default.nix index c93aa0411d4..9b750e60609 100644 --- a/pkgs/development/libraries/haskell/jpeg/default.nix +++ b/pkgs/development/libraries/haskell/jpeg/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 027cf20064e..7601cab340d 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, indexed, indexedFree, lens, text }: cabal.mkDerivation (self: { pname = "json-assertions"; - version = "1.0.2"; - sha256 = "0ppj1xxbi0yrmv6vkmwkz91vvwzjd0ixj60432liwmd6h13apky0"; + version = "1.0.3"; + sha256 = "1iklsgzfxgiizqn90r9wfzfaz84fj8by4arppp139w6ybzh3b0r8"; buildDepends = [ aeson indexed indexedFree lens text ]; meta = { homepage = "http://github.com/ocharles/json-assertions.git"; diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix new file mode 100644 index 00000000000..4eb40764673 --- /dev/null +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, genericAeson, genericDeriving, HUnit +, tagged, tasty, tastyHunit, tastyTh, text, time +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "json-schema"; + version = "0.6.1.1"; + sha256 = "0hn1v2idra9sx1x5mr511h4qcvnhy7b80fgn58w9856w9cl7d34b"; + buildDepends = [ + aeson genericAeson genericDeriving tagged text time + unorderedContainers vector + ]; + testDepends = [ + aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh + text + ]; + meta = { + description = "Types and type classes for defining JSON schemas"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/json/default.nix b/pkgs/development/libraries/haskell/json/default.nix index 9a56f412fe2..3c86f08a4d2 100644 --- a/pkgs/development/libraries/haskell/json/default.nix +++ b/pkgs/development/libraries/haskell/json/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/jsonTypes/default.nix b/pkgs/development/libraries/haskell/jsonTypes/default.nix index dd6c3eb058f..7b950b86225 100644 --- a/pkgs/development/libraries/haskell/jsonTypes/default.nix +++ b/pkgs/development/libraries/haskell/jsonTypes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index fae884b2922..5f9aadd6969 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, adjunctions, comonad, contravariant, distributive, free , mtl, pointed, semigroupoids, speculation, transformers }: diff --git a/pkgs/development/libraries/haskell/kansas-lava/default.nix b/pkgs/development/libraries/haskell/kansas-lava/default.nix index 6ae0447b1fe..55f7dfa595a 100644 --- a/pkgs/development/libraries/haskell/kansas-lava/default.nix +++ b/pkgs/development/libraries/haskell/kansas-lava/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, dataDefault, dataReify, dotgen, filepath, netlist , netlistToVhdl, random, sizedTypes, strict }: diff --git a/pkgs/development/libraries/haskell/keys/default.nix b/pkgs/development/libraries/haskell/keys/default.nix index d97066e57c7..196da768e06 100644 --- a/pkgs/development/libraries/haskell/keys/default.nix +++ b/pkgs/development/libraries/haskell/keys/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, free, semigroupoids, semigroups, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/knob/default.nix b/pkgs/development/libraries/haskell/knob/default.nix index acaf8def004..7ad084e06b7 100644 --- a/pkgs/development/libraries/haskell/knob/default.nix +++ b/pkgs/development/libraries/haskell/knob/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix index 51db50a75b7..6edfac72bf0 100644 --- a/pkgs/development/libraries/haskell/lambdabot-utils/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot-utils/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, haskellSrc, mtl, network, random, regexCompat , regexPosix, syb, tagsoup, utf8String, zlib }: diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index bbf13bd3fe9..9294c019cbd 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, arrows, binary, brainfuck, dataMemocombinators , dependentMap, dependentSum, dependentSumTemplate, dice , editDistance, filepath, haskeline, haskellSrcExts, hoogle diff --git a/pkgs/development/libraries/haskell/lambdabot/wrapper.nix b/pkgs/development/libraries/haskell/lambdabot/wrapper.nix new file mode 100644 index 00000000000..c60d86a02ad --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot/wrapper.nix @@ -0,0 +1,19 @@ +{ stdenv, lambdabot, mueval, ghc, makeWrapper }: + +stdenv.mkDerivation { + name = "lambdabot-wrapper"; + + buildInputs = [ makeWrapper ]; + + buildCommand = '' + makeWrapper "${lambdabot}/bin/lambdabot" "$out/bin/lambdabot" \ + --prefix PATH : "${ghc}/bin:${mueval}/bin" + ''; + + preferLocalBuild = true; + + meta = { + description = lambdabot.meta.description; + }; +} + diff --git a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix index f3c9a8af4ea..169660d27c3 100644 --- a/pkgs/development/libraries/haskell/lambdacube-engine/default.nix +++ b/pkgs/development/libraries/haskell/lambdacube-engine/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bitmap, bytestringTrie, filepath, mtl, OpenGLRaw , stbImage, uulib, vect, vector, vectorAlgorithms, xml, zipArchive }: diff --git a/pkgs/development/libraries/haskell/language-c-inline/default.nix b/pkgs/development/libraries/haskell/language-c-inline/default.nix index 1aef92fe678..d7623534278 100644 --- a/pkgs/development/libraries/haskell/language-c-inline/default.nix +++ b/pkgs/development/libraries/haskell/language-c-inline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, languageCQuote, mainlandPretty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index 3f4ec1e54d8..4e7f9a7570a 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, exceptionMtl, exceptionTransformers, filepath, happy , haskellSrcMeta, HUnit, mainlandPretty, mtl, srcloc, syb, symbol , testFramework, testFrameworkHunit @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.7.7"; - sha256 = "0rj508hfv9xf30rfjhalz3yfb15vp4r4acdj8aahwfnbls2qb37v"; + version = "0.8.0"; + sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix index 7607b3bf3aa..94d8b8e4f47 100644 --- a/pkgs/development/libraries/haskell/language-c/default.nix +++ b/pkgs/development/libraries/haskell/language-c/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, filepath, happy, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-ecmascript/default.nix b/pkgs/development/libraries/haskell/language-ecmascript/default.nix index 9d47c07554c..f2f77fb9dd3 100644 --- a/pkgs/development/libraries/haskell/language-ecmascript/default.nix +++ b/pkgs/development/libraries/haskell/language-ecmascript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefaultClass, Diff, filepath, HUnit, mtl, parsec , QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testingFeat, uniplate, wlPprint diff --git a/pkgs/development/libraries/haskell/language-glsl/default.nix b/pkgs/development/libraries/haskell/language-glsl/default.nix index bdde61739e3..f3a2015ede0 100644 --- a/pkgs/development/libraries/haskell/language-glsl/default.nix +++ b/pkgs/development/libraries/haskell/language-glsl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, prettyclass }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix index a77040a5578..f261a9be7a5 100644 --- a/pkgs/development/libraries/haskell/language-haskell-extract/default.nix +++ b/pkgs/development/libraries/haskell/language-haskell-extract/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/language-java/default.nix b/pkgs/development/libraries/haskell/language-java/default.nix index 8486841a5f6..6811b0db547 100644 --- a/pkgs/development/libraries/haskell/language-java/default.nix +++ b/pkgs/development/libraries/haskell/language-java/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/language-javascript/default.nix b/pkgs/development/libraries/haskell/language-javascript/default.nix index 8b83b64f9c9..d65bc5032c8 100644 --- a/pkgs/development/libraries/haskell/language-javascript/default.nix +++ b/pkgs/development/libraries/haskell/language-javascript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, blazeBuilder, Cabal, happy, HUnit, mtl, QuickCheck , testFramework, testFrameworkHunit, utf8Light, utf8String }: diff --git a/pkgs/development/libraries/haskell/largeword/default.nix b/pkgs/development/libraries/haskell/largeword/default.nix index 814fe50bca7..a644e7fdf79 100644 --- a/pkgs/development/libraries/haskell/largeword/default.nix +++ b/pkgs/development/libraries/haskell/largeword/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix index f409d99987d..dc0fee0762c 100644 --- a/pkgs/development/libraries/haskell/lazysmallcheck/default.nix +++ b/pkgs/development/libraries/haskell/lazysmallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lens-datetime/default.nix b/pkgs/development/libraries/haskell/lens-datetime/default.nix index 72781f39cdb..23084746ea2 100644 --- a/pkgs/development/libraries/haskell/lens-datetime/default.nix +++ b/pkgs/development/libraries/haskell/lens-datetime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix index 7bfb401c756..a5c9e65f8a4 100644 --- a/pkgs/development/libraries/haskell/lens-family-core/default.nix +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { pname = "lens-family-core"; - version = "1.0.0"; - sha256 = "149wfxddw58h5q42r3nknmac8wsc9c8xzsw6vrlfb4yasg7bhw53"; + version = "1.1.0"; + sha256 = "0pvc7iv7y5s3496w7ic9qzdw3l76ldnrg0my0jxi1dyn0vm9xwm3"; buildDepends = [ transformers ]; meta = { description = "Haskell 98 Lens Families"; diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index f6f91da7083..9b769d41ab5 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, bifunctors, comonad, contravariant , deepseq, distributive, doctest, exceptions, filepath, free , genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel @@ -10,8 +12,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.2"; - sha256 = "0aqhr8akb7wg270jxi1ns3mrpv42cfssi3g2kzyhkjmb39qxpp2w"; + version = "4.3"; + sha256 = "0wvsf0vkqjmmgl3p5lxbypn4p126l927ip7l2iisqzwyk87zfqqy"; buildDepends = [ aeson attoparsec bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive diff --git a/pkgs/development/libraries/haskell/lenses/default.nix b/pkgs/development/libraries/haskell/lenses/default.nix index aa560fbda06..debe3061798 100644 --- a/pkgs/development/libraries/haskell/lenses/default.nix +++ b/pkgs/development/libraries/haskell/lenses/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix index becd68ba915..8d4f854a993 100644 --- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, dataDefault, filepath, leveldb, resourcet , transformers }: diff --git a/pkgs/development/libraries/haskell/libffi/default.nix b/pkgs/development/libraries/haskell/libffi/default.nix index da87fc01bc6..6b5892bce45 100644 --- a/pkgs/development/libraries/haskell/libffi/default.nix +++ b/pkgs/development/libraries/haskell/libffi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libffi }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/libjenkins/default.nix b/pkgs/development/libraries/haskell/libjenkins/default.nix index fc7c8b37323..0411cb93063 100644 --- a/pkgs/development/libraries/haskell/libjenkins/default.nix +++ b/pkgs/development/libraries/haskell/libjenkins/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, conduit, doctest, filepath, free, hspec , hspecExpectationsLens, httpClient, httpConduit, httpTypes, lens , monadControl, network, resourcet, text, transformers, xmlConduit diff --git a/pkgs/development/libraries/haskell/liblastfm/default.nix b/pkgs/development/libraries/haskell/liblastfm/default.nix index 1103651f0d0..ea4febaf1d1 100644 --- a/pkgs/development/libraries/haskell/liblastfm/default.nix +++ b/pkgs/development/libraries/haskell/liblastfm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, cereal, contravariant, cryptoApi, httpConduit , httpTypes, network, pureMD5, semigroups, tagged, text, void }: diff --git a/pkgs/development/libraries/haskell/libmpd/default.nix b/pkgs/development/libraries/haskell/libmpd/default.nix index e760421d4eb..43459ed091d 100644 --- a/pkgs/development/libraries/haskell/libmpd/default.nix +++ b/pkgs/development/libraries/haskell/libmpd/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, dataDefault, filepath, hspec, HUnit, mtl , network, QuickCheck, text, time, utf8String }: cabal.mkDerivation (self: { pname = "libmpd"; - version = "0.8.0.4"; - sha256 = "0dk723zly9dkwpgp4157d3a559g9j0ndxfdyp85yqcsr987wplqb"; + version = "0.8.0.5"; + sha256 = "0jxd2xl9imfvb3dz7zqwzx392aw2cb2pl3drx5wkygbywbi5ijhh"; buildDepends = [ attoparsec dataDefault filepath mtl network text time utf8String ]; diff --git a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix index a7eadddac3d..1bb1bcacca3 100644 --- a/pkgs/development/libraries/haskell/libsystemd-journal/default.nix +++ b/pkgs/development/libraries/haskell/libsystemd-journal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, hsyslog, pipes, pipesSafe, systemd-journal, text , transformers, uniplate, unixBytestring, unorderedContainers, uuid , vector diff --git a/pkgs/development/libraries/haskell/libxml-sax/default.nix b/pkgs/development/libraries/haskell/libxml-sax/default.nix index 320a6f20699..43f4e19029b 100644 --- a/pkgs/development/libraries/haskell/libxml-sax/default.nix +++ b/pkgs/development/libraries/haskell/libxml-sax/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libxml2, text, xmlTypes }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index f65c35fb2ae..f5b6f711ab8 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, HUnit, liftedBase, monadControl, mtl, tasty , tastyHunit, tastyTh, transformersBase }: diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index cc8781ae1e1..62b8bdaa8f3 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, monadControl, testFramework, testFrameworkHunit , transformers, transformersBase }: cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.2.2"; - sha256 = "02qjagh4a3zvad7xyvwjd6nkh44c41bqj32ddpn7ms1fv4sl0mam"; + version = "0.2.3.0"; + sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n"; buildDepends = [ monadControl transformersBase ]; testDepends = [ HUnit monadControl testFramework testFrameworkHunit transformers diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index ce9fe66a126..4d99fdd9249 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, adjunctions, binary, distributive, doctest, filepath , hashable, HUnit, lens, reflection, semigroupoids, semigroups , simpleReflect, tagged, testFramework, testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/list-tries/default.nix b/pkgs/development/libraries/haskell/list-tries/default.nix index a7d2a963e0d..3f332dd4083 100644 --- a/pkgs/development/libraries/haskell/list-tries/default.nix +++ b/pkgs/development/libraries/haskell/list-tries/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, dlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/listExtras/default.nix b/pkgs/development/libraries/haskell/listExtras/default.nix index 21e1a7d7c69..2da3060202c 100644 --- a/pkgs/development/libraries/haskell/listExtras/default.nix +++ b/pkgs/development/libraries/haskell/listExtras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lists/default.nix b/pkgs/development/libraries/haskell/lists/default.nix index d7574da0fa7..358d33e35d7 100644 --- a/pkgs/development/libraries/haskell/lists/default.nix +++ b/pkgs/development/libraries/haskell/lists/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, listExtras, split }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix index 0a8f455d971..8b6f3e453d6 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.3.8.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, transformers }: diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix index bfa0ed43d0e..c8601d844ca 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, parsec, QuickCheck, setenv, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, transformers }: diff --git a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix index 2eb0a2c5d20..fce7847dac7 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.3.8.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec , QuickCheck, setenv, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, utf8String diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix index 43a346ebf19..25993bb9fd0 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, llvmConfig, llvmGeneralPure, mtl, parsec , QuickCheck, setenv, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, utf8String diff --git a/pkgs/development/libraries/haskell/loch-th/default.nix b/pkgs/development/libraries/haskell/loch-th/default.nix new file mode 100644 index 00000000000..5061524708b --- /dev/null +++ b/pkgs/development/libraries/haskell/loch-th/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "loch-th"; + version = "0.2.1"; + sha256 = "1kfrjsgzq6wl749n2wm1fhwwigjxcd9lww7whiwjrbmhiz5ism3p"; + meta = { + homepage = "https://github.com/liskin/loch-th"; + description = "Support for precise error locations in source files (Template Haskell version)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lockfree-queue/default.nix b/pkgs/development/libraries/haskell/lockfree-queue/default.nix index a5106d910f3..822cfb29c1d 100644 --- a/pkgs/development/libraries/haskell/lockfree-queue/default.nix +++ b/pkgs/development/libraries/haskell/lockfree-queue/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractDeque, abstractDequeTests, atomicPrimops, HUnit , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/logfloat/default.nix b/pkgs/development/libraries/haskell/logfloat/default.nix index 3088004d0a8..a0b2024abc8 100644 --- a/pkgs/development/libraries/haskell/logfloat/default.nix +++ b/pkgs/development/libraries/haskell/logfloat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/logging/default.nix b/pkgs/development/libraries/haskell/logging/default.nix index 7fa30c1cb3a..83ee93f8463 100644 --- a/pkgs/development/libraries/haskell/logging/default.nix +++ b/pkgs/development/libraries/haskell/logging/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, fastLogger, hspec, liftedBase, monadControl , monadLogger, pcreLight, text, time, transformers, vectorSpace }: diff --git a/pkgs/development/libraries/haskell/logict/default.nix b/pkgs/development/libraries/haskell/logict/default.nix index b0768708429..78912a9ed38 100644 --- a/pkgs/development/libraries/haskell/logict/default.nix +++ b/pkgs/development/libraries/haskell/logict/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lrucache/default.nix b/pkgs/development/libraries/haskell/lrucache/default.nix index 43fdd6caf99..6c28b6c8cd5 100644 --- a/pkgs/development/libraries/haskell/lrucache/default.nix +++ b/pkgs/development/libraries/haskell/lrucache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lushtags/default.nix b/pkgs/development/libraries/haskell/lushtags/default.nix index bf05cd5e63d..f7f8997480a 100644 --- a/pkgs/development/libraries/haskell/lushtags/default.nix +++ b/pkgs/development/libraries/haskell/lushtags/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix index f931262a91e..34604a6fc66 100644 --- a/pkgs/development/libraries/haskell/lzma-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/lzma-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsDSL, enumerator, HUnit, lzma, mtl, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/maccatcher/default.nix b/pkgs/development/libraries/haskell/maccatcher/default.nix index 6109f33f82f..24be1424c99 100644 --- a/pkgs/development/libraries/haskell/maccatcher/default.nix +++ b/pkgs/development/libraries/haskell/maccatcher/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index cd69d9133a6..1b391739c20 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, doctest, filepath, free, mtl, pointed , profunctors, semigroups, transformers, void }: diff --git a/pkgs/development/libraries/haskell/mainland-pretty/default.nix b/pkgs/development/libraries/haskell/mainland-pretty/default.nix index 60990d2dbca..b8797be5410 100644 --- a/pkgs/development/libraries/haskell/mainland-pretty/default.nix +++ b/pkgs/development/libraries/haskell/mainland-pretty/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, srcloc, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/markdown-unlit/default.nix b/pkgs/development/libraries/haskell/markdown-unlit/default.nix index e09feb10d90..226a4efa8c7 100644 --- a/pkgs/development/libraries/haskell/markdown-unlit/default.nix +++ b/pkgs/development/libraries/haskell/markdown-unlit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck, silently, stringbuilder }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/markov-chain/default.nix b/pkgs/development/libraries/haskell/markov-chain/default.nix index 5907fce4f17..8b8138d1dd1 100644 --- a/pkgs/development/libraries/haskell/markov-chain/default.nix +++ b/pkgs/development/libraries/haskell/markov-chain/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/math-functions/default.nix b/pkgs/development/libraries/haskell/math-functions/default.nix index b14449626c8..8fce8ec4f09 100644 --- a/pkgs/development/libraries/haskell/math-functions/default.nix +++ b/pkgs/development/libraries/haskell/math-functions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, erf, HUnit, ieee754, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector , vectorThUnbox diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix index 84f0d83a924..3c9cd2590ad 100644 --- a/pkgs/development/libraries/haskell/maude/default.nix +++ b/pkgs/development/libraries/haskell/maude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, processExtras, temporary, text, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix index 97f163f5735..b10c70093ce 100644 --- a/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix +++ b/pkgs/development/libraries/haskell/mersenne-random-pure64/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/midi/default.nix b/pkgs/development/libraries/haskell/midi/default.nix index 71593bd21cd..864d3c5c427 100644 --- a/pkgs/development/libraries/haskell/midi/default.nix +++ b/pkgs/development/libraries/haskell/midi/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, eventList, explicitException, monoidTransformer , nonNegative, QuickCheck, random, transformers, utilityHt }: cabal.mkDerivation (self: { pname = "midi"; - version = "0.2.1.2"; - sha256 = "077cxdazr97hjpq42l7hjn905pfhyshvaiwqjdfnzhjv6r48q4zk"; + version = "0.2.1.3"; + sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a"; buildDepends = [ binary eventList explicitException monoidTransformer nonNegative QuickCheck random transformers utilityHt diff --git a/pkgs/development/libraries/haskell/mime-mail/default.nix b/pkgs/development/libraries/haskell/mime-mail/default.nix index 88eabe59e3f..96daa23df7a 100644 --- a/pkgs/development/libraries/haskell/mime-mail/default.nix +++ b/pkgs/development/libraries/haskell/mime-mail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, filepath, hspec, random , sendmail ? "sendmail", text }: diff --git a/pkgs/development/libraries/haskell/mime-types/default.nix b/pkgs/development/libraries/haskell/mime-types/default.nix index 50c25ada340..774b4472b16 100644 --- a/pkgs/development/libraries/haskell/mime-types/default.nix +++ b/pkgs/development/libraries/haskell/mime-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mime/default.nix b/pkgs/development/libraries/haskell/mime/default.nix index 6e1a3482c04..288890b89d8 100644 --- a/pkgs/development/libraries/haskell/mime/default.nix +++ b/pkgs/development/libraries/haskell/mime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/minimorph/default.nix b/pkgs/development/libraries/haskell/minimorph/default.nix index 08865132701..c0593855644 100644 --- a/pkgs/development/libraries/haskell/minimorph/default.nix +++ b/pkgs/development/libraries/haskell/minimorph/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, testFramework, testFrameworkHunit, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix index 99cae442c3b..a426927e318 100644 --- a/pkgs/development/libraries/haskell/minioperational/default.nix +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/miniutter/default.nix b/pkgs/development/libraries/haskell/miniutter/default.nix index 389a79dd6e1..2400721a656 100644 --- a/pkgs/development/libraries/haskell/miniutter/default.nix +++ b/pkgs/development/libraries/haskell/miniutter/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, HUnit, minimorph, testFramework , testFrameworkHunit, text }: cabal.mkDerivation (self: { pname = "miniutter"; - version = "0.4.3.0"; - sha256 = "0hslks4vr1738pczgzzcl0mrb9jqs1986vjgw4xpvzz9p3ki1n50"; + version = "0.4.4.0"; + sha256 = "1pfgbvnxh3c9b489i121p5bg785bp9ivfwizjfwc9w3r6spgppvk"; buildDepends = [ binary minimorph text ]; testDepends = [ HUnit testFramework testFrameworkHunit text ]; meta = { diff --git a/pkgs/development/libraries/haskell/misfortune/default.nix b/pkgs/development/libraries/haskell/misfortune/default.nix index 5fe26fff744..cc619288213 100644 --- a/pkgs/development/libraries/haskell/misfortune/default.nix +++ b/pkgs/development/libraries/haskell/misfortune/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, filepath, knob, monadLoops, randomFu, regexBase , regexPcre, semigroups, text, utf8String, vector }: diff --git a/pkgs/development/libraries/haskell/missing-foreign/default.nix b/pkgs/development/libraries/haskell/missing-foreign/default.nix index 9ffbc37468a..928cf73d457 100644 --- a/pkgs/development/libraries/haskell/missing-foreign/default.nix +++ b/pkgs/development/libraries/haskell/missing-foreign/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mmap/default.nix b/pkgs/development/libraries/haskell/mmap/default.nix index 53785f45c22..36b4470203c 100644 --- a/pkgs/development/libraries/haskell/mmap/default.nix +++ b/pkgs/development/libraries/haskell/mmap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix index 4b3e687fd8f..b13eeeb5d83 100644 --- a/pkgs/development/libraries/haskell/mmorph/default.nix +++ b/pkgs/development/libraries/haskell/mmorph/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix index 6a6a7c99d70..614fe145bea 100644 --- a/pkgs/development/libraries/haskell/modular-arithmetic/default.nix +++ b/pkgs/development/libraries/haskell/modular-arithmetic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-control/default.nix b/pkgs/development/libraries/haskell/monad-control/default.nix index c865d964c54..3641f259b99 100644 --- a/pkgs/development/libraries/haskell/monad-control/default.nix +++ b/pkgs/development/libraries/haskell/monad-control/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers, transformersBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-coroutine/default.nix b/pkgs/development/libraries/haskell/monad-coroutine/default.nix index 6ddf872a6da..9bcfcc6d4b0 100644 --- a/pkgs/development/libraries/haskell/monad-coroutine/default.nix +++ b/pkgs/development/libraries/haskell/monad-coroutine/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monadParallel, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-extras/default.nix b/pkgs/development/libraries/haskell/monad-extras/default.nix index e8a7af28613..3be5d829856 100644 --- a/pkgs/development/libraries/haskell/monad-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mmorph, monadControl, stm, transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index e0902b7d4f7..8a4122efc8f 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, conduitExtra, exceptions , fastLogger, liftedBase, monadControl, monadLoops, mtl, resourcet , stm, stmChans, text, transformers, transformersBase @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.6.1"; - sha256 = "0ylsrhp2a9qir03nmmz6rkim149pw1fgm63lfg611gvh598ig6ss"; + version = "0.3.7"; + sha256 = "03fzp8cvx8qapyjgnm6gywj8b1pcd43y3fb4vg1wgxa55lsg6y58"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/monad-loops/default.nix b/pkgs/development/libraries/haskell/monad-loops/default.nix index a58d90fc98b..f08363edbde 100644 --- a/pkgs/development/libraries/haskell/monad-loops/default.nix +++ b/pkgs/development/libraries/haskell/monad-loops/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "monad-loops"; - version = "0.4.2"; - sha256 = "08sz08p4z1p78dv7rmsqvin59h19i6i07sp7jg3zwxwjxa76fds8"; + version = "0.4.2.1"; + sha256 = "1dprwndc0bxzpmrkj1xb9kzjrg3i06zsg43yaabn5x5gcaj8is56"; meta = { homepage = "https://github.com/mokus0/monad-loops"; description = "Monadic loops"; diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix index 6b9ca0e7553..95336d28e3d 100644 --- a/pkgs/development/libraries/haskell/monad-par-extras/default.nix +++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractPar, cereal, deepseq, mtl, random, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix index 8692d6267cb..fe89beb0dea 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix index 911d984a88c..daf62521811 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, abstractDeque, abstractPar, deepseq, HUnit, monadParExtras , mtl, mwcRandom, parallel, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, testFrameworkTh diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix index 1ee628cb36a..db53712d4ef 100644 --- a/pkgs/development/libraries/haskell/monad-parallel/default.nix +++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parallel, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-peel/default.nix b/pkgs/development/libraries/haskell/monad-peel/default.nix index 39f911dae93..37cd3f74c53 100644 --- a/pkgs/development/libraries/haskell/monad-peel/default.nix +++ b/pkgs/development/libraries/haskell/monad-peel/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-stm/default.nix b/pkgs/development/libraries/haskell/monad-stm/default.nix index 5f923f5110a..5418817160f 100644 --- a/pkgs/development/libraries/haskell/monad-stm/default.nix +++ b/pkgs/development/libraries/haskell/monad-stm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monad-unify/default.nix b/pkgs/development/libraries/haskell/monad-unify/default.nix index 7ee1f8c8704..f4fac043ea1 100644 --- a/pkgs/development/libraries/haskell/monad-unify/default.nix +++ b/pkgs/development/libraries/haskell/monad-unify/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix index 87bd36503e1..e6388ebfa36 100644 --- a/pkgs/development/libraries/haskell/monadcryptorandom/default.nix +++ b/pkgs/development/libraries/haskell/monadcryptorandom/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cryptoApi, mtl, tagged, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadlib/default.nix b/pkgs/development/libraries/haskell/monadlib/default.nix index a893eb6f4e4..0ada70b4714 100644 --- a/pkgs/development/libraries/haskell/monadlib/default.nix +++ b/pkgs/development/libraries/haskell/monadlib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix new file mode 100644 index 00000000000..661781415cb --- /dev/null +++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, haskellSrcExts, monadloc, syb }: + +cabal.mkDerivation (self: { + pname = "monadloc-pp"; + version = "0.3"; + sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn"; + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath haskellSrcExts monadloc syb ]; + jailbreak = true; + meta = { + homepage = "http://github.com/pepeiborra/monadloc"; + description = "A preprocessor for generating monadic call traces"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/monadloc/default.nix b/pkgs/development/libraries/haskell/monadloc/default.nix index 9ff7383565e..4d99a61335c 100644 --- a/pkgs/development/libraries/haskell/monadloc/default.nix +++ b/pkgs/development/libraries/haskell/monadloc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monads-tf/default.nix b/pkgs/development/libraries/haskell/monads-tf/default.nix index b57a432fcab..e18b1e711c9 100644 --- a/pkgs/development/libraries/haskell/monads-tf/default.nix +++ b/pkgs/development/libraries/haskell/monads-tf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mongoDB/default.nix b/pkgs/development/libraries/haskell/mongoDB/default.nix index 259a8e2fc2d..d156c9c101e 100644 --- a/pkgs/development/libraries/haskell/mongoDB/default.nix +++ b/pkgs/development/libraries/haskell/mongoDB/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bson, cryptohash, hashtables, liftedBase , monadControl, mtl, network, parsec, random, randomShuffle, text , transformersBase @@ -5,14 +7,14 @@ cabal.mkDerivation (self: { pname = "mongoDB"; - version = "1.5.0"; - sha256 = "0dvy8pa79c26hcngds6nnwnayrhsyz1flj18m9bcyrcvwb5q3dd6"; + version = "2.0.2"; + sha256 = "02xq80jcrrp41gzzg7008spw3npj6iz3gcf1bkj4cf8vjs44nplf"; buildDepends = [ binary bson cryptohash hashtables liftedBase monadControl mtl network parsec random randomShuffle text transformersBase ]; meta = { - homepage = "http://github.com/selectel/mongodb-haskell"; + homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = "unknown"; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index b8acec758de..73685698f5e 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, dlist, dlistInstances, foldl, hashable, hspec , QuickCheck, semigroupoids, semigroups, text, transformers , unorderedContainers, vector, vectorAlgorithms, vectorInstances @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.0.2"; - sha256 = "1ckdx8szllk4np5samfdx7l6lzarmfabm8w4210b5m7yms2w98sy"; + version = "0.6.0.4"; + sha256 = "1svqxc96n2andxcgrv8s29hkq6nw1qigv5p0dw9vx2ynk68pfhww"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index dc4bb6dbb66..3c0a742a1f3 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, groups, semigroupoids, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/monoid-transformer/default.nix b/pkgs/development/libraries/haskell/monoid-transformer/default.nix index 5894eccd4b7..147045287dd 100644 --- a/pkgs/development/libraries/haskell/monoid-transformer/default.nix +++ b/pkgs/development/libraries/haskell/monoid-transformer/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mpppc/default.nix b/pkgs/development/libraries/haskell/mpppc/default.nix index 54357821171..d33225c21f1 100644 --- a/pkgs/development/libraries/haskell/mpppc/default.nix +++ b/pkgs/development/libraries/haskell/mpppc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, split, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/msgpack/default.nix b/pkgs/development/libraries/haskell/msgpack/default.nix index 4f84537e72e..b2a626621fe 100644 --- a/pkgs/development/libraries/haskell/msgpack/default.nix +++ b/pkgs/development/libraries/haskell/msgpack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, deepseq, hashable, mtl , QuickCheck, testFramework, testFrameworkQuickcheck2, text , unorderedContainers, vector diff --git a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix index fc8fdaef752..b6185d5d569 100644 --- a/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix +++ b/pkgs/development/libraries/haskell/mtl/1.1.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix index 3c91b65efa0..d4f6505f357 100644 --- a/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix +++ b/pkgs/development/libraries/haskell/mtl/2.0.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.1.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.1.nix index b9298325c20..ccc23775d94 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.1.2.nix b/pkgs/development/libraries/haskell/mtl/2.1.2.nix index c10f526acf2..ab512d5713b 100644 --- a/pkgs/development/libraries/haskell/mtl/2.1.2.nix +++ b/pkgs/development/libraries/haskell/mtl/2.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix index 649ce516286..2864c9b1d2a 100644 --- a/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtl/2.2.1.nix b/pkgs/development/libraries/haskell/mtl/2.2.1.nix index e7147b28767..6589488edc0 100644 --- a/pkgs/development/libraries/haskell/mtl/2.2.1.nix +++ b/pkgs/development/libraries/haskell/mtl/2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mtlparse/default.nix b/pkgs/development/libraries/haskell/mtlparse/default.nix index 37be70cebcb..7b5993e0dc0 100644 --- a/pkgs/development/libraries/haskell/mtlparse/default.nix +++ b/pkgs/development/libraries/haskell/mtlparse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mueval/default.nix b/pkgs/development/libraries/haskell/mueval/default.nix index 06d2f58ce17..225994a32e5 100644 --- a/pkgs/development/libraries/haskell/mueval/default.nix +++ b/pkgs/development/libraries/haskell/mueval/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, extensibleExceptions, filepath, hint, mtl, show , simpleReflect, utf8String }: diff --git a/pkgs/development/libraries/haskell/mueval/wrapper.nix b/pkgs/development/libraries/haskell/mueval/wrapper.nix new file mode 100644 index 00000000000..6c3beb4da8b --- /dev/null +++ b/pkgs/development/libraries/haskell/mueval/wrapper.nix @@ -0,0 +1,33 @@ +{ stdenv, mueval, makeWrapper, ghc +, show, simpleReflect, mtl, random, QuickCheck +, additionalPackages ? [] }: + +stdenv.mkDerivation { + name = "mueval-wrapper"; + + buildInputs = [ makeWrapper show simpleReflect mtl random QuickCheck ] + ++ additionalPackages; + + ghcVersion = ghc.version; + + buildCommand = '' + PKGPATH="" + for p in $nativePkgs; do + for i in "$p/lib/ghc-$ghcVersion/package.conf.d/"*.installedconf; do + PKGPATH=$PKGPATH''${PKGPATH:+:}$i + done + done + + makeWrapper "${mueval}/bin/mueval" "$out/bin/mueval" \ + --prefix PATH : "${mueval}/bin" \ + --prefix GHC_PACKAGE_PATH : "$PKGPATH" \ + --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages + ''; + + preferLocalBuild = true; + + meta = { + description = mueval.meta.description; + }; +} + diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index e8e608f0e0b..2df62aa1e77 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bifunctors, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multimap/default.nix b/pkgs/development/libraries/haskell/multimap/default.nix index 27283ad6a65..15764392bf1 100644 --- a/pkgs/development/libraries/haskell/multimap/default.nix +++ b/pkgs/development/libraries/haskell/multimap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multipart/default.nix b/pkgs/development/libraries/haskell/multipart/default.nix new file mode 100644 index 00000000000..242005392c2 --- /dev/null +++ b/pkgs/development/libraries/haskell/multipart/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parsec }: + +cabal.mkDerivation (self: { + pname = "multipart"; + version = "0.1.1"; + sha256 = "12sxi21baq1wsa3z6qrczyk47finw85yiql26l90wxk99smm90pj"; + buildDepends = [ parsec ]; + meta = { + homepage = "http://www.github.com/silkapp/multipart"; + description = "A partial fork of the cgi package exposing the multipart module"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/multiplate/default.nix b/pkgs/development/libraries/haskell/multiplate/default.nix index 32626ae68e6..7cec18ddf3d 100644 --- a/pkgs/development/libraries/haskell/multiplate/default.nix +++ b/pkgs/development/libraries/haskell/multiplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multirec/default.nix b/pkgs/development/libraries/haskell/multirec/default.nix index 85c2a671dbf..0d1d434db1d 100644 --- a/pkgs/development/libraries/haskell/multirec/default.nix +++ b/pkgs/development/libraries/haskell/multirec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/multiset/default.nix b/pkgs/development/libraries/haskell/multiset/default.nix index 16fcf155747..72c172d659a 100644 --- a/pkgs/development/libraries/haskell/multiset/default.nix +++ b/pkgs/development/libraries/haskell/multiset/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/murmur-hash/default.nix b/pkgs/development/libraries/haskell/murmur-hash/default.nix index 12d5d550d10..c983e00fa66 100644 --- a/pkgs/development/libraries/haskell/murmur-hash/default.nix +++ b/pkgs/development/libraries/haskell/murmur-hash/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/mwc-random/default.nix b/pkgs/development/libraries/haskell/mwc-random/default.nix index 995571abc20..fad0f0de0cb 100644 --- a/pkgs/development/libraries/haskell/mwc-random/default.nix +++ b/pkgs/development/libraries/haskell/mwc-random/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, primitive, QuickCheck, statistics, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, time, vector }: cabal.mkDerivation (self: { pname = "mwc-random"; - version = "0.13.1.1"; - sha256 = "1hi9ci65m3pjkli0rvx2x4fmp73c9fsmnc1zkpaj4g64ibhhir64"; + version = "0.13.1.2"; + sha256 = "0b0amp9nv750azg3jc5yyfpdaqzh0z09jp41hwgrzr0j6kq1ygqi"; buildDepends = [ primitive time vector ]; testDepends = [ HUnit QuickCheck statistics testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/mysql-simple/default.nix b/pkgs/development/libraries/haskell/mysql-simple/default.nix index e61d493cdbe..3698b727fe0 100644 --- a/pkgs/development/libraries/haskell/mysql-simple/default.nix +++ b/pkgs/development/libraries/haskell/mysql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual , mysql, pcreLight, text, time }: diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix index 4deec5bb767..a9801f6415f 100644 --- a/pkgs/development/libraries/haskell/mysql/default.nix +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mysqlConfig, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/nanospec/default.nix b/pkgs/development/libraries/haskell/nanospec/default.nix index 367d24f3226..156e0c04a0a 100644 --- a/pkgs/development/libraries/haskell/nanospec/default.nix +++ b/pkgs/development/libraries/haskell/nanospec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, silently }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/nat/default.nix b/pkgs/development/libraries/haskell/nat/default.nix index 3ad4240e289..e3b55592204 100644 --- a/pkgs/development/libraries/haskell/nat/default.nix +++ b/pkgs/development/libraries/haskell/nat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index 74303667a07..e870d171383 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/naturals/default.nix b/pkgs/development/libraries/haskell/naturals/default.nix index 787ac70ffa9..f4ed7dd2a12 100644 --- a/pkgs/development/libraries/haskell/naturals/default.nix +++ b/pkgs/development/libraries/haskell/naturals/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index 2b566f79a98..7e9ac0ddd95 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, c2hs, ncurses, text, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix index ff9ed1ac0bf..6794ce4f37f 100644 --- a/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix +++ b/pkgs/development/libraries/haskell/netlist-to-vhdl/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, netlist }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/netlist/default.nix b/pkgs/development/libraries/haskell/netlist/default.nix index 57550dcb3d8..70d993cf8e4 100644 --- a/pkgs/development/libraries/haskell/netlist/default.nix +++ b/pkgs/development/libraries/haskell/netlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/netwire/default.nix b/pkgs/development/libraries/haskell/netwire/default.nix index a2b2810f6f9..7321c3e88e8 100644 --- a/pkgs/development/libraries/haskell/netwire/default.nix +++ b/pkgs/development/libraries/haskell/netwire/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, parallel, random, semigroups, time, transformers }: diff --git a/pkgs/development/libraries/haskell/network-carbon/default.nix b/pkgs/development/libraries/haskell/network-carbon/default.nix new file mode 100644 index 00000000000..c9bbe2b0daf --- /dev/null +++ b/pkgs/development/libraries/haskell/network-carbon/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, network, text, time, vector }: + +cabal.mkDerivation (self: { + pname = "network-carbon"; + version = "1.0.1"; + sha256 = "1q3b7vw80yw6fkmpwgazy8ikhbwjmmqmm4fry8c9f8ckkpzahj2b"; + buildDepends = [ network text time vector ]; + meta = { + homepage = "http://github.com/ocharles/network-carbon"; + description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index e4c5bb7ab6b..45d912da07a 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, connection, cprngAes, dataDefault , HUnit, monadControl, mtl, network, streamingCommons, systemFileio , systemFilepath, tls, transformers diff --git a/pkgs/development/libraries/haskell/network-conduit/default.nix b/pkgs/development/libraries/haskell/network-conduit/default.nix index 1f252c03660..0ab913c1e85 100644 --- a/pkgs/development/libraries/haskell/network-conduit/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-info/default.nix b/pkgs/development/libraries/haskell/network-info/default.nix index c1bfea43bde..df584710c14 100644 --- a/pkgs/development/libraries/haskell/network-info/default.nix +++ b/pkgs/development/libraries/haskell/network-info/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "network-info"; - version = "0.2.0.3"; - sha256 = "04nwl5akrsppxkqqq7a7qi5sixvrzvj4njl8rbz7sglbh9393rs2"; + version = "0.2.0.5"; + sha256 = "0ggxnkjkbspynma0wjrc1wwwb9ygx2dhl0n9lfaq7l8r69z7pqwf"; meta = { homepage = "http://github.com/jystic/network-info"; description = "Access the local computer's basic network configuration"; diff --git a/pkgs/development/libraries/haskell/network-metrics/default.nix b/pkgs/development/libraries/haskell/network-metrics/default.nix index f9f92170b57..024192a06a8 100644 --- a/pkgs/development/libraries/haskell/network-metrics/default.nix +++ b/pkgs/development/libraries/haskell/network-metrics/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, dataDefault, network, random, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-multicast/default.nix b/pkgs/development/libraries/haskell/network-multicast/default.nix index 78d1b36f34d..00c2980462d 100644 --- a/pkgs/development/libraries/haskell/network-multicast/default.nix +++ b/pkgs/development/libraries/haskell/network-multicast/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix index cd56082d8b5..90d9becb804 100644 --- a/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix +++ b/pkgs/development/libraries/haskell/network-protocol-xmpp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, gnuidn, gnutls, gsasl, libxmlSax, monadsTf, network, text , transformers, xmlTypes }: diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index c50afdb2120..6795da96450 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, network, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index 840712e3416..b4a70eb6843 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -1,22 +1,21 @@ -{ cabal, dataAccessor, dataAccessorTransformers, HUnit -, lockfreeQueue, mtl, network, networkTransport -, networkTransportTests, QuickCheck, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2, transformers +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, dataAccessor, network, networkTransport +, networkTransportTests }: cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.3.1"; - sha256 = "15i4qbx1s3dxaixn6kd2z1hsymfvpqzf4jpqd3mcbpjlgrn6craf"; + version = "0.4.0"; + sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; buildDepends = [ dataAccessor network networkTransport ]; - testDepends = [ - dataAccessor dataAccessorTransformers HUnit lockfreeQueue mtl - network networkTransport networkTransportTests QuickCheck - testFramework testFrameworkHunit testFrameworkQuickcheck2 - transformers - ]; + testDepends = [ network networkTransport networkTransportTests ]; + doCheck = false; + patchPhase = '' + sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal + ''; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index 7aedea7995b..15d54633b50 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, mtl, networkTransport, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index eaa41944a6b..00c15e2721f 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -1,12 +1,14 @@ -{ cabal, binary, transformers }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, hashable, transformers }: cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.3.0.1"; - sha256 = "1iijcd864znik83smk1bjidinm199wri5fdyrhnffj0n35knrvas"; - buildDepends = [ binary transformers ]; + version = "0.4.0.0"; + sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz"; + buildDepends = [ binary hashable transformers ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Network abstraction layer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/network/2.2.1.4.nix b/pkgs/development/libraries/haskell/network/2.2.1.4.nix index 68c7937497c..9023e560125 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.4.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.2.1.7.nix b/pkgs/development/libraries/haskell/network/2.2.1.7.nix index f66d81f79f4..e05266da9a2 100644 --- a/pkgs/development/libraries/haskell/network/2.2.1.7.nix +++ b/pkgs/development/libraries/haskell/network/2.2.1.7.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.0.13.nix b/pkgs/development/libraries/haskell/network/2.3.0.13.nix index 834b7872c6b..57ebe9c8e0c 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.13.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.13.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.0.2.nix b/pkgs/development/libraries/haskell/network/2.3.0.2.nix index a1a9a36d738..b59ad26dfad 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.2.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.0.5.nix b/pkgs/development/libraries/haskell/network/2.3.0.5.nix index 9434d83d7f0..b435cf23154 100644 --- a/pkgs/development/libraries/haskell/network/2.3.0.5.nix +++ b/pkgs/development/libraries/haskell/network/2.3.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.3.1.0.nix b/pkgs/development/libraries/haskell/network/2.3.1.0.nix index dc0c1811e59..9bbd354196d 100644 --- a/pkgs/development/libraries/haskell/network/2.3.1.0.nix +++ b/pkgs/development/libraries/haskell/network/2.3.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/network/2.4.1.2.nix b/pkgs/development/libraries/haskell/network/2.4.1.2.nix index 6f245cf1840..7d8fd561c11 100644 --- a/pkgs/development/libraries/haskell/network/2.4.1.2.nix +++ b/pkgs/development/libraries/haskell/network/2.4.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix index f042b4b7008..5a485b27762 100644 --- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/network/2.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, parsec, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/newtype/default.nix b/pkgs/development/libraries/haskell/newtype/default.nix index 40354c9472c..14105ed7349 100644 --- a/pkgs/development/libraries/haskell/newtype/default.nix +++ b/pkgs/development/libraries/haskell/newtype/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/non-negative/default.nix b/pkgs/development/libraries/haskell/non-negative/default.nix index ae025f6cc64..92d1cf77c63 100644 --- a/pkgs/development/libraries/haskell/non-negative/default.nix +++ b/pkgs/development/libraries/haskell/non-negative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, utilityHt }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numbers/default.nix b/pkgs/development/libraries/haskell/numbers/default.nix index 902ea9ce880..b47b9339596 100644 --- a/pkgs/development/libraries/haskell/numbers/default.nix +++ b/pkgs/development/libraries/haskell/numbers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix index 76783dceb49..918427d0fa0 100644 --- a/pkgs/development/libraries/haskell/numeric-extras/default.nix +++ b/pkgs/development/libraries/haskell/numeric-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numeric-prelude/default.nix b/pkgs/development/libraries/haskell/numeric-prelude/default.nix index 4fac81b01f9..a58b3885f51 100644 --- a/pkgs/development/libraries/haskell/numeric-prelude/default.nix +++ b/pkgs/development/libraries/haskell/numeric-prelude/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, nonNegative, parsec, QuickCheck, random , storableRecord, utilityHt }: diff --git a/pkgs/development/libraries/haskell/numtype-tf/default.nix b/pkgs/development/libraries/haskell/numtype-tf/default.nix index d317f57efce..3b6c777efbf 100644 --- a/pkgs/development/libraries/haskell/numtype-tf/default.nix +++ b/pkgs/development/libraries/haskell/numtype-tf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/numtype/default.nix b/pkgs/development/libraries/haskell/numtype/default.nix index 25e0a61beb9..fcef793fe70 100644 --- a/pkgs/development/libraries/haskell/numtype/default.nix +++ b/pkgs/development/libraries/haskell/numtype/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/oeis/default.nix b/pkgs/development/libraries/haskell/oeis/default.nix index e7da848e4b2..b58df3be314 100644 --- a/pkgs/development/libraries/haskell/oeis/default.nix +++ b/pkgs/development/libraries/haskell/oeis/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, HUnit, network, testFramework, testFrameworkHunit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/openssl-streams/default.nix b/pkgs/development/libraries/haskell/openssl-streams/default.nix index 33b48d1f121..28609f9e0f6 100644 --- a/pkgs/development/libraries/haskell/openssl-streams/default.nix +++ b/pkgs/development/libraries/haskell/openssl-streams/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HsOpenSSL, HUnit, ioStreams, network, testFramework , testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/operational/default.nix b/pkgs/development/libraries/haskell/operational/default.nix index 2fbe5a7f210..d3359a3377e 100644 --- a/pkgs/development/libraries/haskell/operational/default.nix +++ b/pkgs/development/libraries/haskell/operational/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/opml/default.nix b/pkgs/development/libraries/haskell/opml/default.nix index be7cb0606ee..a44954c10cd 100644 --- a/pkgs/development/libraries/haskell/opml/default.nix +++ b/pkgs/development/libraries/haskell/opml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/options/default.nix b/pkgs/development/libraries/haskell/options/default.nix index f89cdd5045f..721de1e600e 100644 --- a/pkgs/development/libraries/haskell/options/default.nix +++ b/pkgs/development/libraries/haskell/options/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, chellQuickcheck, monadsTf, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/optparse-applicative/default.nix b/pkgs/development/libraries/haskell/optparse-applicative/default.nix index bad23a102ee..191efd723f7 100644 --- a/pkgs/development/libraries/haskell/optparse-applicative/default.nix +++ b/pkgs/development/libraries/haskell/optparse-applicative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiWlPprint, HUnit, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 , testFrameworkThPrime, transformers, transformersCompat diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix index 9738ad9e19c..48a45e56097 100644 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, aesonPretty, attoparsec, filepath, hexpat , hsBibutils, HTTP, mtl, network, pandoc, pandocTypes, parsec , rfc5051, split, syb, tagsoup, temporary, texmath, text, time diff --git a/pkgs/development/libraries/haskell/pandoc-types/default.nix b/pkgs/development/libraries/haskell/pandoc-types/default.nix index 28b4acbfe1d..ee44d908c49 100644 --- a/pkgs/development/libraries/haskell/pandoc-types/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-types/default.nix @@ -1,10 +1,12 @@ -{ cabal, aeson, syb }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, deepseqGenerics, syb }: cabal.mkDerivation (self: { pname = "pandoc-types"; - version = "1.12.3.3"; - sha256 = "1rw641w8xdisnbni5glxqxgfjps6p8vpnvprd4zgsjqn71397pdk"; - buildDepends = [ aeson syb ]; + version = "1.12.4"; + sha256 = "10vlw8iabaay0xqlshagl45ksawlanlg6fyqwv9d448qm32ngvdn"; + buildDepends = [ aeson deepseqGenerics syb ]; meta = { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 04738c0c00e..6247ed1aee0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, alex, ansiTerminal, attoparsec, base64Bytestring , binary, blazeHtml, blazeMarkup, dataDefault, Diff , extensibleExceptions, filepath, happy, highlightingKate, hslua diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 84823b90e47..765f4c7a3fc 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, glib, gtk2hsBuildtools, libc, mtl, pango, pkgconfig }: diff --git a/pkgs/development/libraries/haskell/parallel-io/default.nix b/pkgs/development/libraries/haskell/parallel-io/default.nix index 56c1a130696..b9f6eda669e 100644 --- a/pkgs/development/libraries/haskell/parallel-io/default.nix +++ b/pkgs/development/libraries/haskell/parallel-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix index 5212e6b2847..6a4f20a43c0 100644 --- a/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/1.1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix index 9fb661fd481..b48676419fe 100644 --- a/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/2.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix index 83283c2317b..07320ea8d3f 100644 --- a/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parallel/3.1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix index 365ed196841..50a574deded 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix index e089c8dce8e..e66e5ba6918 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix index 4f255e893af..c2df1e52d10 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parseargs/default.nix b/pkgs/development/libraries/haskell/parseargs/default.nix index a421338624c..516bc5bd985 100644 --- a/pkgs/development/libraries/haskell/parseargs/default.nix +++ b/pkgs/development/libraries/haskell/parseargs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix index 17c046a06e1..ffbab8a942a 100644 --- a/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix +++ b/pkgs/development/libraries/haskell/parsec/2.1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.1.nix b/pkgs/development/libraries/haskell/parsec/3.1.1.nix index 62c5b67b0e9..0f56abc5835 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.1.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.2.nix b/pkgs/development/libraries/haskell/parsec/3.1.2.nix index d043fde0120..eb1fb4699b0 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.2.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.3.nix b/pkgs/development/libraries/haskell/parsec/3.1.3.nix index 20902162169..78ff6eceb28 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.3.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsec/3.1.5.nix b/pkgs/development/libraries/haskell/parsec/3.1.5.nix index 9d1174db056..d3dd8bf3791 100644 --- a/pkgs/development/libraries/haskell/parsec/3.1.5.nix +++ b/pkgs/development/libraries/haskell/parsec/3.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix index 84e5619167a..7f1ea0824cd 100644 --- a/pkgs/development/libraries/haskell/parsers/0.10.3.nix +++ b/pkgs/development/libraries/haskell/parsers/0.10.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, charset, doctest, filepath, parsec, text, transformers , unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix b/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix deleted file mode 100644 index 36c5f2ae998..00000000000 --- a/pkgs/development/libraries/haskell/parsers/0.11.0.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, attoparsec, charset, doctest, filepath, parsec, text -, transformers, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.11.0.2"; - sha256 = "0b2qb6lhn647926s2g7qrzhnvnym5dr7fny784bv19mfvimwi81c"; - buildDepends = [ - attoparsec charset parsec text transformers unorderedContainers - ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsers/0.12.nix b/pkgs/development/libraries/haskell/parsers/0.12.nix new file mode 100644 index 00000000000..bb383b078aa --- /dev/null +++ b/pkgs/development/libraries/haskell/parsers/0.12.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, charset, doctest, filepath, parsec, QuickCheck +, quickcheckInstances, text, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "parsers"; + version = "0.12"; + sha256 = "0lb1djb2mmlkfqpbz7683i27d3ivv0r99l6w79951wgsqb62xph3"; + buildDepends = [ + attoparsec charset parsec text transformers unorderedContainers + ]; + testDepends = [ + attoparsec doctest filepath parsec QuickCheck quickcheckInstances + ]; + meta = { + homepage = "http://github.com/ekmett/parsers/"; + description = "Parsing combinators"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/parsimony/default.nix b/pkgs/development/libraries/haskell/parsimony/default.nix index 4245fcf7f40..45fad0d6628 100644 --- a/pkgs/development/libraries/haskell/parsimony/default.nix +++ b/pkgs/development/libraries/haskell/parsimony/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/path-pieces/default.nix b/pkgs/development/libraries/haskell/path-pieces/default.nix index b2952748843..5fc9faecf2e 100644 --- a/pkgs/development/libraries/haskell/path-pieces/default.nix +++ b/pkgs/development/libraries/haskell/path-pieces/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, QuickCheck, text, time }: cabal.mkDerivation (self: { pname = "path-pieces"; - version = "0.1.3.1"; - sha256 = "140pkci5k6aa9ncxa29fn2p0g6lb79zci0k02nblv59qmj5hj8ic"; + version = "0.1.4"; + sha256 = "1fxhp4bk88km7z1rdpify7l38li5k21qxw3vgcmq9b6bblvz6y2v"; buildDepends = [ text time ]; testDepends = [ hspec HUnit QuickCheck text ]; meta = { diff --git a/pkgs/development/libraries/haskell/pathtype/default.nix b/pkgs/development/libraries/haskell/pathtype/default.nix index f0be81e64ae..eb6fb43e8d6 100644 --- a/pkgs/development/libraries/haskell/pathtype/default.nix +++ b/pkgs/development/libraries/haskell/pathtype/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/patience/default.nix b/pkgs/development/libraries/haskell/patience/default.nix index 0f65e3eceed..6f70eb1e14d 100644 --- a/pkgs/development/libraries/haskell/patience/default.nix +++ b/pkgs/development/libraries/haskell/patience/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pattern-arrows/default.nix b/pkgs/development/libraries/haskell/pattern-arrows/default.nix index a73432fe62b..43ef906aad2 100644 --- a/pkgs/development/libraries/haskell/pattern-arrows/default.nix +++ b/pkgs/development/libraries/haskell/pattern-arrows/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pbkdf/default.nix b/pkgs/development/libraries/haskell/pbkdf/default.nix index 29ccc2b63da..6f30043ee3b 100644 --- a/pkgs/development/libraries/haskell/pbkdf/default.nix +++ b/pkgs/development/libraries/haskell/pbkdf/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, byteable, bytedump, cryptohash, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix index 2a86ebb7229..f7480295f6d 100644 --- a/pkgs/development/libraries/haskell/pcap-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/pcap-enumerator/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, enumerator, pcap, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pcap/default.nix b/pkgs/development/libraries/haskell/pcap/default.nix index 876905a4a5a..56e2e71969c 100644 --- a/pkgs/development/libraries/haskell/pcap/default.nix +++ b/pkgs/development/libraries/haskell/pcap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libpcap, network, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pcre-light/default.nix b/pkgs/development/libraries/haskell/pcre-light/default.nix index 33333e2d698..5e29497196c 100644 --- a/pkgs/development/libraries/haskell/pcre-light/default.nix +++ b/pkgs/development/libraries/haskell/pcre-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pcre }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pem/default.nix b/pkgs/development/libraries/haskell/pem/default.nix index 410d9c3d4c4..df43a297c71 100644 --- a/pkgs/development/libraries/haskell/pem/default.nix +++ b/pkgs/development/libraries/haskell/pem/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, HUnit, mtl, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/permutation/default.nix b/pkgs/development/libraries/haskell/permutation/default.nix index f44ab16f563..0f907f9e121 100644 --- a/pkgs/development/libraries/haskell/permutation/default.nix +++ b/pkgs/development/libraries/haskell/permutation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix index 7ff8a9de430..beb2ca94263 100644 --- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeBuilder, conduit, monadControl, mysql , mysqlSimple, persistent, resourcet, text, transformers }: diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 49a505e8dd1..93488c74063 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeBuilder, conduit, monadControl, persistent , postgresqlLibpq, postgresqlSimple, resourcet, text, time , transformers diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index cb12d9cbe84..dbb5e676779 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, conduit, monadControl, monadLogger, persistent , resourcet, text, transformers }: diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix index b967e17f8f7..a1dfa4fcc29 100644 --- a/pkgs/development/libraries/haskell/persistent-template/default.nix +++ b/pkgs/development/libraries/haskell/persistent-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, hspec, monadControl, monadLogger, persistent , QuickCheck, text, transformers, unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index dd37b96c2d8..3647431bbb1 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base64Bytestring, blazeHtml , blazeMarkup, conduit, exceptions, hspec, liftedBase, monadControl , monadLogger, pathPieces, resourcePool, resourcet, scientific diff --git a/pkgs/development/libraries/haskell/pgm/default.nix b/pkgs/development/libraries/haskell/pgm/default.nix index 560826a08b2..b8a8a22a462 100644 --- a/pkgs/development/libraries/haskell/pgm/default.nix +++ b/pkgs/development/libraries/haskell/pgm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-aeson/default.nix b/pkgs/development/libraries/haskell/pipes-aeson/default.nix index aa226aa4e3b..96044afae0e 100644 --- a/pkgs/development/libraries/haskell/pipes-aeson/default.nix +++ b/pkgs/development/libraries/haskell/pipes-aeson/default.nix @@ -1,15 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, pipes, pipesAttoparsec, pipesBytestring , pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-aeson"; - version = "0.4.1"; - sha256 = "06fxl4az5brbivc5db498fc3yawrc2rwnrn20rbssihd0lp9xm1i"; + version = "0.4.1.1"; + sha256 = "1z520c9l2wqjcv5lb997n3zfks7p0z7dlwgqm74dcwnnfy3mfp9j"; buildDepends = [ aeson attoparsec pipes pipesAttoparsec pipesBytestring pipesParse transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/k0001/pipes-aeson"; description = "Encode and decode JSON streams using Aeson and Pipes"; diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 04efb0cee73..9a304a7b3ec 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, HUnit, mmorph, pipes, pipesParse, tasty , tastyHunit, text, transformers }: diff --git a/pkgs/development/libraries/haskell/pipes-binary/default.nix b/pkgs/development/libraries/haskell/pipes-binary/default.nix index e48ad2a96a4..94f899c6a8d 100644 --- a/pkgs/development/libraries/haskell/pipes-binary/default.nix +++ b/pkgs/development/libraries/haskell/pipes-binary/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, lensFamilyCore, pipes, pipesBytestring, pipesParse , smallcheck, tasty, tastyHunit, tastySmallcheck, transformers }: cabal.mkDerivation (self: { pname = "pipes-binary"; - version = "0.4.0.1"; - sha256 = "1vwsr446b3ysjm86bmpmq8pg2badx9xn0iyr17r4mby0bxvvld33"; + version = "0.4.0.2"; + sha256 = "1lbz2hybglkmm7dawg16pma2yr732yy1agh5b9vwlw2ik92hrm58"; buildDepends = [ binary pipes pipesBytestring pipesParse transformers ]; @@ -13,6 +15,7 @@ cabal.mkDerivation (self: { binary lensFamilyCore pipes pipesParse smallcheck tasty tastyHunit tastySmallcheck transformers ]; + jailbreak = true; doCheck = false; meta = { homepage = "https://github.com/k0001/pipes-binary"; diff --git a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix index 2a2324027d4..34fd47a8ed6 100644 --- a/pkgs/development/libraries/haskell/pipes-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/pipes-bytestring/default.nix @@ -1,13 +1,12 @@ -{ cabal, pipes, pipesGroup, pipesParse, profunctors, transformers -}: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, pipes, pipesGroup, pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-bytestring"; - version = "2.0.1"; - sha256 = "1vsfqqkr5danb0n30av4vk8d4by9f50y5l8ywm1xjrmwrx999gvf"; - buildDepends = [ - pipes pipesGroup pipesParse profunctors transformers - ]; + version = "2.1.0"; + sha256 = "1q98444kpcdc817zbg121g2n1mhblrdfsmd0bs5rqq6ijxb213z0"; + buildDepends = [ pipes pipesGroup pipesParse transformers ]; meta = { description = "ByteString support for pipes"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix index 00336e8077d..826a594757e 100644 --- a/pkgs/development/libraries/haskell/pipes-concurrency/default.nix +++ b/pkgs/development/libraries/haskell/pipes-concurrency/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, pipes, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-csv/default.nix b/pkgs/development/libraries/haskell/pipes-csv/default.nix new file mode 100644 index 00000000000..c18d2297f67 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-csv/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, blazeBuilder, cassava, HUnit, pipes, pipesBytestring +, testFramework, testFrameworkHunit, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "pipes-csv"; + version = "1.4.0"; + sha256 = "1q1gnfnkvlkk8lwllhyar7323k3jynh9rl6x9yks7lc3nqr1n16j"; + buildDepends = [ + blazeBuilder cassava pipes unorderedContainers vector + ]; + testDepends = [ + cassava HUnit pipes pipesBytestring testFramework + testFrameworkHunit vector + ]; + meta = { + description = "Fast, streaming csv parser"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-group/default.nix b/pkgs/development/libraries/haskell/pipes-group/default.nix index 5fd5d7e1251..584713352ba 100644 --- a/pkgs/development/libraries/haskell/pipes-group/default.nix +++ b/pkgs/development/libraries/haskell/pipes-group/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, free, pipes, pipesParse, transformers }: cabal.mkDerivation (self: { pname = "pipes-group"; - version = "1.0.0"; - sha256 = "1izc2z3cwz7dihhfrngjyiaxmcpp794ragbl6v17y8c2pj0s34kh"; + version = "1.0.1"; + sha256 = "19caih65hsvnvkwv8dlrrf961aw6k0zr9yx78cia1padslidxlbw"; buildDepends = [ free pipes pipesParse transformers ]; meta = { description = "Group streams into substreams"; diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix new file mode 100644 index 00000000000..285d1405191 --- /dev/null +++ b/pkgs/development/libraries/haskell/pipes-http/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, httpClient, httpClientTls, pipes }: + +cabal.mkDerivation (self: { + pname = "pipes-http"; + version = "1.0.1"; + sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w"; + buildDepends = [ httpClient httpClientTls pipes ]; + meta = { + description = "HTTP client with pipes interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pipes-network/default.nix b/pkgs/development/libraries/haskell/pipes-network/default.nix index 5ec70a010a5..fcd19402648 100644 --- a/pkgs/development/libraries/haskell/pipes-network/default.nix +++ b/pkgs/development/libraries/haskell/pipes-network/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network, networkSimple, pipes, pipesSafe, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-parse/default.nix b/pkgs/development/libraries/haskell/pipes-parse/default.nix index 5f5dec485b6..fa54300fe20 100644 --- a/pkgs/development/libraries/haskell/pipes-parse/default.nix +++ b/pkgs/development/libraries/haskell/pipes-parse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix index 830f188fed8..61440c534a8 100644 --- a/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/pipes-postgresql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, exceptions, mtl, pipes, pipesConcurrency, pipesSafe , postgresqlSimple, stm, text, transformers }: diff --git a/pkgs/development/libraries/haskell/pipes-safe/default.nix b/pkgs/development/libraries/haskell/pipes-safe/default.nix index 2e664631f1f..7867e5f2a3c 100644 --- a/pkgs/development/libraries/haskell/pipes-safe/default.nix +++ b/pkgs/development/libraries/haskell/pipes-safe/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, pipes, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pipes-text/default.nix b/pkgs/development/libraries/haskell/pipes-text/default.nix index 7156b889789..deef6e0fdb6 100644 --- a/pkgs/development/libraries/haskell/pipes-text/default.nix +++ b/pkgs/development/libraries/haskell/pipes-text/default.nix @@ -1,15 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, pipesBytestring, pipesGroup, pipesParse, pipesSafe -, profunctors, streamingCommons, text, transformers +, streamingCommons, text, transformers }: cabal.mkDerivation (self: { pname = "pipes-text"; - version = "0.0.0.11"; - sha256 = "0c56gxm17bapdjgbp2f55z3f6vq8ryvsljqp3bcjjj18xv5pf1ls"; + version = "0.0.0.12"; + sha256 = "18xf0rhshbl03js50n98k96692w98j0j0dfyi67780i08c39dq6m"; buildDepends = [ - pipes pipesBytestring pipesGroup pipesParse pipesSafe profunctors + pipes pipesBytestring pipesGroup pipesParse pipesSafe streamingCommons text transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/michaelt/text-pipes"; description = "Text pipes"; diff --git a/pkgs/development/libraries/haskell/pipes-zlib/default.nix b/pkgs/development/libraries/haskell/pipes-zlib/default.nix index 67d08ebcb4a..5b471fd55a3 100644 --- a/pkgs/development/libraries/haskell/pipes-zlib/default.nix +++ b/pkgs/development/libraries/haskell/pipes-zlib/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pipes, transformers, zlib, zlibBindings }: cabal.mkDerivation (self: { pname = "pipes-zlib"; - version = "0.4.0"; - sha256 = "1xi8x7cfzr7042x5jq8b6xqdhffh1jgprk90yzsfjldllck9z5ia"; + version = "0.4.0.1"; + sha256 = "1k91q5hci4hk2kzaqfvg1nwbklqyg83wwhm3sdfhdn2famj0mls0"; buildDepends = [ pipes transformers zlib zlibBindings ]; meta = { homepage = "https://github.com/k0001/pipes-zlib"; diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 21f349768c0..d6d8c4daf96 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mmorph, mtl, QuickCheck, testFramework , testFrameworkQuickcheck2, transformers }: diff --git a/pkgs/development/libraries/haskell/placeholders/default.nix b/pkgs/development/libraries/haskell/placeholders/default.nix new file mode 100644 index 00000000000..bb4a2c5ca15 --- /dev/null +++ b/pkgs/development/libraries/haskell/placeholders/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "placeholders"; + version = "0.1"; + sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5"; + meta = { + homepage = "http://github.com/ahammar/placeholders"; + description = "Placeholders for use while developing Haskell code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/plugins/default.nix b/pkgs/development/libraries/haskell/plugins/default.nix new file mode 100644 index 00000000000..face90f5b1d --- /dev/null +++ b/pkgs/development/libraries/haskell/plugins/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, filepath, ghcPaths, haskellSrc, random }: + +cabal.mkDerivation (self: { + pname = "plugins"; + version = "1.5.4.0"; + sha256 = "126lp2bbz9aa3pfi5dmbbzgsancdj1m26k7man96avixb21mzbi8"; + buildDepends = [ Cabal filepath ghcPaths haskellSrc random ]; + meta = { + homepage = "http://hub.darcs.net/stepcut/plugins"; + description = "Dynamic linking for Haskell and C objects"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index 7a02d5850d2..f486737765e 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm , tagged, transformers }: diff --git a/pkgs/development/libraries/haskell/pointedlist/default.nix b/pkgs/development/libraries/haskell/pointedlist/default.nix index a7b23cd85af..8acb4bac6b1 100644 --- a/pkgs/development/libraries/haskell/pointedlist/default.nix +++ b/pkgs/development/libraries/haskell/pointedlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/polyparse/default.nix b/pkgs/development/libraries/haskell/polyparse/default.nix index 45b994026c2..5b6029261eb 100644 --- a/pkgs/development/libraries/haskell/polyparse/default.nix +++ b/pkgs/development/libraries/haskell/polyparse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pool-conduit/default.nix b/pkgs/development/libraries/haskell/pool-conduit/default.nix index cb1682673af..f5cc7fe0b8b 100644 --- a/pkgs/development/libraries/haskell/pool-conduit/default.nix +++ b/pkgs/development/libraries/haskell/pool-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, monadControl, resourcePool, resourcet, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pop3-client/default.nix b/pkgs/development/libraries/haskell/pop3-client/default.nix index 6656814f64f..e0f1edad52e 100644 --- a/pkgs/development/libraries/haskell/pop3-client/default.nix +++ b/pkgs/development/libraries/haskell/pop3-client/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index aecd54c3998..064153599d0 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, gdk_pixbuf, glib, gtk, gtk2hsBuildtools, libc, mtl , pango, popplerGlib }: diff --git a/pkgs/development/libraries/haskell/posix-paths/default.nix b/pkgs/development/libraries/haskell/posix-paths/default.nix index 96775121acb..3a49c84b783 100644 --- a/pkgs/development/libraries/haskell/posix-paths/default.nix +++ b/pkgs/development/libraries/haskell/posix-paths/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix index 40acabad1cd..b0a1ccb1784 100644 --- a/pkgs/development/libraries/haskell/postgresql-libpq/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-libpq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, postgresql }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index c88ba4e845d..58b6948dd98 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder , blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq , scientific, text, time, transformers, uuid, vector @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.2.3"; - sha256 = "1rg6virvz4nr0m39sr72h23yks5f8ih9nimgacx30zw7xvnx942p"; + version = "0.4.3.0"; + sha256 = "16i1qzshbscnbjb4rxz5hl1iaxjmsc21878prj5pp33zbm53dlcm"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector diff --git a/pkgs/development/libraries/haskell/ppm/default.nix b/pkgs/development/libraries/haskell/ppm/default.nix index c55fc0226e9..8cda8613cda 100644 --- a/pkgs/development/libraries/haskell/ppm/default.nix +++ b/pkgs/development/libraries/haskell/ppm/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pqueue/default.nix b/pkgs/development/libraries/haskell/pqueue/default.nix index 8634c414318..fdf153c5a26 100644 --- a/pkgs/development/libraries/haskell/pqueue/default.nix +++ b/pkgs/development/libraries/haskell/pqueue/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/prelude-extras/default.nix b/pkgs/development/libraries/haskell/prelude-extras/default.nix index 33275952e0d..40cbfef908a 100644 --- a/pkgs/development/libraries/haskell/prelude-extras/default.nix +++ b/pkgs/development/libraries/haskell/prelude-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix index 7b96ba87a8e..8e2ba95e993 100644 --- a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix +++ b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix index c8a01b35a97..021becccfa1 100644 --- a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix +++ b/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix index f266cf6cdab..e7a116b2133 100644 --- a/pkgs/development/libraries/haskell/presburger/default.nix +++ b/pkgs/development/libraries/haskell/presburger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pretty-show/default.nix b/pkgs/development/libraries/haskell/pretty-show/default.nix index 56126a42cb3..51f9c8d0970 100644 --- a/pkgs/development/libraries/haskell/pretty-show/default.nix +++ b/pkgs/development/libraries/haskell/pretty-show/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, happy, haskellLexer }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/prettyclass/default.nix b/pkgs/development/libraries/haskell/prettyclass/default.nix index af4e4d7beaa..a81d734aaa9 100644 --- a/pkgs/development/libraries/haskell/prettyclass/default.nix +++ b/pkgs/development/libraries/haskell/prettyclass/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix index af6778ccd14..6f0cdc2e0bd 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix index ff62216b3f4..1fe7ceaf9c9 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix index 8f1090c09b1..df7ebb17099 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix index a22ea14cd53..4f93724c3fe 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/process-conduit/default.nix b/pkgs/development/libraries/haskell/process-conduit/default.nix index aea29a4d02b..ff8a54b8571 100644 --- a/pkgs/development/libraries/haskell/process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/process-conduit/default.nix @@ -1,20 +1,22 @@ -{ cabal, conduit, controlMonadLoop, hspec, mtl, resourcet -, shakespeare, shakespeareText, text +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, conduit, conduitExtra, controlMonadLoop, hspec, mtl +, resourcet, shakespeare, shakespeareText, text }: cabal.mkDerivation (self: { pname = "process-conduit"; - version = "1.1.0.0"; - sha256 = "1b3snck651cpb7i3c78cn264zrjan3lzydf59209abkvb6fv1hql"; + version = "1.2.0.1"; + sha256 = "0hnbywmjvk3y26sc9a0jfqzm04pg08zd2bflld1mvni02s89lvc8"; buildDepends = [ conduit controlMonadLoop mtl resourcet shakespeare shakespeareText text ]; - testDepends = [ conduit hspec ]; + testDepends = [ conduit conduitExtra hspec resourcet ]; doCheck = false; meta = { - homepage = "http://github.com/tanakh/process-conduit"; - description = "Conduits for processes"; + homepage = "http://github.com/snoyberg/process-conduit"; + description = "Conduits for processes (deprecated)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/process-extras/default.nix b/pkgs/development/libraries/haskell/process-extras/default.nix index 1d9cb4f8062..ae4f2d65c1c 100644 --- a/pkgs/development/libraries/haskell/process-extras/default.nix +++ b/pkgs/development/libraries/haskell/process-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/process/1.2.0.0.nix b/pkgs/development/libraries/haskell/process/1.2.0.0.nix index f3ae03da7c4..76a00ce0262 100644 --- a/pkgs/development/libraries/haskell/process/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/process/1.2.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/profunctor-extras/default.nix b/pkgs/development/libraries/haskell/profunctor-extras/default.nix index bf7e6ab7121..657d7312e82 100644 --- a/pkgs/development/libraries/haskell/profunctor-extras/default.nix +++ b/pkgs/development/libraries/haskell/profunctor-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, profunctors }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/profunctors/default.nix b/pkgs/development/libraries/haskell/profunctors/default.nix index f8d2e727353..f9aa0481d43 100644 --- a/pkgs/development/libraries/haskell/profunctors/default.nix +++ b/pkgs/development/libraries/haskell/profunctors/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, semigroupoids, tagged, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 58dc06e6aa5..9aa8dff59aa 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, conduit, conduitExtra, hspec, mtl , QuickCheck, resourcet, systemFileio, systemFilepath, text , transformers diff --git a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix index 98b65bb59f0..49239e8a829 100644 --- a/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph-lib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fgl, graphviz, mtl, prolog, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/prolog-graph/default.nix b/pkgs/development/libraries/haskell/prolog-graph/default.nix index 8016095a402..c45e5e20d9c 100644 --- a/pkgs/development/libraries/haskell/prolog-graph/default.nix +++ b/pkgs/development/libraries/haskell/prolog-graph/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, fgl, graphviz, mtl, prolog, prologGraphLib, text }: diff --git a/pkgs/development/libraries/haskell/prolog/default.nix b/pkgs/development/libraries/haskell/prolog/default.nix index b1e6e1d4e30..aaf4dbdbcd8 100644 --- a/pkgs/development/libraries/haskell/prolog/default.nix +++ b/pkgs/development/libraries/haskell/prolog/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, syb, thLift, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix index 7b14fabd8b1..a3550417ccd 100644 --- a/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix +++ b/pkgs/development/libraries/haskell/protocol-buffers-descriptor/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, protocolBuffers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/protocol-buffers/default.nix b/pkgs/development/libraries/haskell/protocol-buffers/default.nix index bf74e4fc4d6..9435c664b66 100644 --- a/pkgs/development/libraries/haskell/protocol-buffers/default.nix +++ b/pkgs/development/libraries/haskell/protocol-buffers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, filepath, mtl, syb, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix index ea1bb7164c8..2a2d8fcd098 100644 --- a/pkgs/development/libraries/haskell/publicsuffixlist/default.nix +++ b/pkgs/development/libraries/haskell/publicsuffixlist/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, dataDefault, HUnit, idna, text, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/punycode/default.nix b/pkgs/development/libraries/haskell/punycode/default.nix index a4ad760d8ff..3a07d382754 100644 --- a/pkgs/development/libraries/haskell/punycode/default.nix +++ b/pkgs/development/libraries/haskell/punycode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, encoding, HUnit, mtl, QuickCheck, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/pureMD5/default.nix b/pkgs/development/libraries/haskell/pureMD5/default.nix index 8e66b2c3c03..7df0bdbec77 100644 --- a/pkgs/development/libraries/haskell/pureMD5/default.nix +++ b/pkgs/development/libraries/haskell/pureMD5/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, cryptoApi, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 4109fc89a2c..ab05167683f 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec , patternArrows, time, transformers, unorderedContainers , utf8String, xdgBasedir @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.5.2.3"; - sha256 = "09z56gb3k1ya5c3yznm49sgd1g9i5wvn5ih4mycf5ys2wvy3v9sl"; + version = "0.5.3"; + sha256 = "05vhz3j4gx9paxmvimy154730078bl148819shwml6l6vq02723i"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index 42aaeba82a8..ff6f2004d98 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, binary, cryptohash, random, SHA }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/qrencode/default.nix b/pkgs/development/libraries/haskell/qrencode/default.nix index bd46bb9b415..89defe86bad 100644 --- a/pkgs/development/libraries/haskell/qrencode/default.nix +++ b/pkgs/development/libraries/haskell/qrencode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, qrencode }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix index 90d26883d98..68189f7ae76 100644 --- a/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-assertions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, ieee754, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix index b45fab000ca..9454a1a23b2 100644 --- a/pkgs/development/libraries/haskell/quickcheck-instances/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, QuickCheck, text, time, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-io/default.nix b/pkgs/development/libraries/haskell/quickcheck-io/default.nix index 9e345f80053..d96131c5332 100644 --- a/pkgs/development/libraries/haskell/quickcheck-io/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix index 203f22146b1..3ef3b02851e 100644 --- a/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix +++ b/pkgs/development/libraries/haskell/quickcheck-property-monad/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, either, filepath, QuickCheck, transformers }: cabal.mkDerivation (self: { pname = "quickcheck-property-monad"; - version = "0.2.1"; - sha256 = "1ln8bcsc8hd8jyhd9rp2j90p5h5nhmwidb5my91p09h43y4z9xds"; + version = "0.2.3"; + sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb"; buildDepends = [ either QuickCheck transformers ]; testDepends = [ doctest filepath QuickCheck ]; meta = { diff --git a/pkgs/development/libraries/haskell/random-fu/default.nix b/pkgs/development/libraries/haskell/random-fu/default.nix index 41999e535e0..d4a561b2973 100644 --- a/pkgs/development/libraries/haskell/random-fu/default.nix +++ b/pkgs/development/libraries/haskell/random-fu/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, erf, mathFunctions, monadLoops, mtl, randomShuffle , randomSource, rvar, syb, transformers, vector }: cabal.mkDerivation (self: { pname = "random-fu"; - version = "0.2.5.0"; - sha256 = "1yfq7mvplzdk64i7z5ip8vjynn48a65z28xrhcv91qi0yjxsxdm0"; + version = "0.2.6.0"; + sha256 = "1mi1hr3hxlnyjf01hgn7xinr1m0rax26759zbkhf5xn04ps0g01p"; buildDepends = [ erf mathFunctions monadLoops mtl randomShuffle randomSource rvar syb transformers vector diff --git a/pkgs/development/libraries/haskell/random-shuffle/default.nix b/pkgs/development/libraries/haskell/random-shuffle/default.nix index 1104091ae57..c4f3ce565dd 100644 --- a/pkgs/development/libraries/haskell/random-shuffle/default.nix +++ b/pkgs/development/libraries/haskell/random-shuffle/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MonadRandom, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/random-source/default.nix b/pkgs/development/libraries/haskell/random-source/default.nix index 895a001d46f..6b5856f1650 100644 --- a/pkgs/development/libraries/haskell/random-source/default.nix +++ b/pkgs/development/libraries/haskell/random-source/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, flexibleDefaults, mersenneRandomPure64, mtl, mwcRandom , random, stateref, syb, thExtras }: diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index 1f4901a4d91..b14d850e44a 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/ranges/default.nix b/pkgs/development/libraries/haskell/ranges/default.nix index 2182e6410b5..a12ea697a48 100644 --- a/pkgs/development/libraries/haskell/ranges/default.nix +++ b/pkgs/development/libraries/haskell/ranges/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rank1dynamic/default.nix b/pkgs/development/libraries/haskell/rank1dynamic/default.nix index 8694d2399b2..456b92332c1 100644 --- a/pkgs/development/libraries/haskell/rank1dynamic/default.nix +++ b/pkgs/development/libraries/haskell/rank1dynamic/default.nix @@ -1,12 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary }: cabal.mkDerivation (self: { pname = "rank1dynamic"; - version = "0.1.0.2"; - sha256 = "1341hhbdm6y0mj0qjda0ckqsla51fxiy1yfpbwfvsmpi2bkzgxn6"; + version = "0.2.0.0"; + sha256 = "09p3lggnsn0355440d9cazwijv9qm4siw99gg2xkk2hamp2sj42h"; buildDepends = [ binary ]; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix index c224da3a339..43c2f16cf99 100644 --- a/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana-wx/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cabalMacosx, reactiveBanana, wx, wxcore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/reactive-banana/default.nix b/pkgs/development/libraries/haskell/reactive-banana/default.nix index e2cda01ee40..464a333f04e 100644 --- a/pkgs/development/libraries/haskell/reactive-banana/default.nix +++ b/pkgs/development/libraries/haskell/reactive-banana/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, HUnit, pqueue, testFramework, testFrameworkHunit , transformers, unorderedContainers, vault }: diff --git a/pkgs/development/libraries/haskell/readline/default.nix b/pkgs/development/libraries/haskell/readline/default.nix index 6090fc8578a..9a05fed7e12 100644 --- a/pkgs/development/libraries/haskell/readline/default.nix +++ b/pkgs/development/libraries/haskell/readline/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, readline, ncurses }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index 2d3fb430fe2..f97b8e3168b 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HTTP, network, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/recursion-schemes/default.nix b/pkgs/development/libraries/haskell/recursion-schemes/default.nix index 78e7da44061..e846d69d0db 100644 --- a/pkgs/development/libraries/haskell/recursion-schemes/default.nix +++ b/pkgs/development/libraries/haskell/recursion-schemes/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, free, transformers }: cabal.mkDerivation (self: { pname = "recursion-schemes"; - version = "4.0"; - sha256 = "1xc1k04p3birxgv5h3ypw85w0cgq4d5rsmadx4pc3j409y6i5p06"; + version = "4.1"; + sha256 = "03rf65ak6bxsr204j6d8g5zyxva9vbmncycav3smqwfg5n3b3pwf"; buildDepends = [ comonad free transformers ]; meta = { homepage = "http://github.com/ekmett/recursion-schemes/"; diff --git a/pkgs/development/libraries/haskell/reducers/default.nix b/pkgs/development/libraries/haskell/reducers/default.nix index ac00a1ca5c1..bfa8a063b8e 100644 --- a/pkgs/development/libraries/haskell/reducers/default.nix +++ b/pkgs/development/libraries/haskell/reducers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, fingertree, hashable, keys, pointed , semigroupoids, semigroups, text, transformers , unorderedContainers diff --git a/pkgs/development/libraries/haskell/reflection/default.nix b/pkgs/development/libraries/haskell/reflection/default.nix index a02a7ec6907..b7138c3e974 100644 --- a/pkgs/development/libraries/haskell/reflection/default.nix +++ b/pkgs/development/libraries/haskell/reflection/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, tagged }: cabal.mkDerivation (self: { pname = "reflection"; - version = "1.4"; - sha256 = "0i6yb3fa9wizyaz8x9b7yzkw9jf7zahdrkr2y0iw7igdxqn4n0k7"; + version = "1.5.1"; + sha256 = "18ail6j7rs5jff9zxphxd7vjkwanpv12dhi98s86r65425fdhjlx"; buildDepends = [ tagged ]; meta = { homepage = "http://github.com/ekmett/reflection"; diff --git a/pkgs/development/libraries/haskell/regex-applicative/default.nix b/pkgs/development/libraries/haskell/regex-applicative/default.nix index 5cb6485ec71..4da323419a1 100644 --- a/pkgs/development/libraries/haskell/regex-applicative/default.nix +++ b/pkgs/development/libraries/haskell/regex-applicative/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, smallcheck, tasty, tastyHunit, tastySmallcheck , transformers }: diff --git a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix index e94a233d9f1..691bee5e1ac 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.72.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix index 5a49d2b6407..93243aecb57 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix index 1dc559e6370..662a06b94e1 100644 --- a/pkgs/development/libraries/haskell/regex-base/0.93.2.nix +++ b/pkgs/development/libraries/haskell/regex-base/0.93.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix index 6a45c87d9a6..b364f3714a6 100644 --- a/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-compat-tdfa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexTdfa }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix index 623db0cc48b..de895393452 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.71.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.92.nix b/pkgs/development/libraries/haskell/regex-compat/0.92.nix index 8b9e666d6ae..3e7d58d6c9b 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.92.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.92.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix index df3a7abf13f..47d15fed0c4 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.93.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix index 52c28d8b800..e984a69ad81 100644 --- a/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-compat/0.95.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexPosix }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-pcre/default.nix b/pkgs/development/libraries/haskell/regex-pcre/default.nix index 2b7f53e4572..83984e08e2e 100644 --- a/pkgs/development/libraries/haskell/regex-pcre/default.nix +++ b/pkgs/development/libraries/haskell/regex-pcre/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pcre, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix index f1f6a89dc3d..58d788e2959 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.72.0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix index 662d8236c45..b3cb528e21a 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix index 11e02b398b5..3598d91fb3d 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix index 42ee42ba7ef..81d337871d6 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.94.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix index 58106bc8b74..1f9a44acfb0 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix index 6d7fac51658..7db5ede5a02 100644 --- a/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix +++ b/pkgs/development/libraries/haskell/regex-posix/0.95.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix new file mode 100644 index 00000000000..0e5bb61bfed --- /dev/null +++ b/pkgs/development/libraries/haskell/regex-tdfa-rc/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, parsec, regexBase }: + +cabal.mkDerivation (self: { + pname = "regex-tdfa-rc"; + version = "1.1.8.3"; + sha256 = "1vi11i23gkkjg6193ak90g55akj69bhahy542frkwb68haky4pp3"; + buildDepends = [ mtl parsec regexBase ]; + meta = { + homepage = "http://hackage.haskell.org/package/regex-tdfa"; + description = "Replaces/Enhances Text.Regex"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix index 1a329c25b2d..b532234312a 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, regexBase, regexTdfa, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regex-tdfa/default.nix b/pkgs/development/libraries/haskell/regex-tdfa/default.nix index 7f9bce42cf6..2c07d848820 100644 --- a/pkgs/development/libraries/haskell/regex-tdfa/default.nix +++ b/pkgs/development/libraries/haskell/regex-tdfa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, parsec, regexBase }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regexpr/default.nix b/pkgs/development/libraries/haskell/regexpr/default.nix index c5389a7b663..3b2e70478de 100644 --- a/pkgs/development/libraries/haskell/regexpr/default.nix +++ b/pkgs/development/libraries/haskell/regexpr/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, mtlparse }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix new file mode 100644 index 00000000000..35a3f32847e --- /dev/null +++ b/pkgs/development/libraries/haskell/regular-xmlpickler/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hxt, regular, text }: + +cabal.mkDerivation (self: { + pname = "regular-xmlpickler"; + version = "0.2"; + sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f"; + buildDepends = [ hxt regular text ]; + meta = { + homepage = "http://github.com/silkapp/regular-xmlpickler"; + description = "Generic generation of HXT XmlPickler instances using Regular"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/regular/default.nix b/pkgs/development/libraries/haskell/regular/default.nix index 97920780533..eaf4044831a 100644 --- a/pkgs/development/libraries/haskell/regular/default.nix +++ b/pkgs/development/libraries/haskell/regular/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/remote/default.nix b/pkgs/development/libraries/haskell/remote/default.nix index 3e160130ea8..b1a7f8af9c2 100644 --- a/pkgs/development/libraries/haskell/remote/default.nix +++ b/pkgs/development/libraries/haskell/remote/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, filepath, mtl, network, pureMD5, stm, syb, time , utf8String }: diff --git a/pkgs/development/libraries/haskell/repa-algorithms/default.nix b/pkgs/development/libraries/haskell/repa-algorithms/default.nix index 06725444e86..8e9d668e389 100644 --- a/pkgs/development/libraries/haskell/repa-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/repa-algorithms/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, llvm, repa, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/repa-examples/default.nix b/pkgs/development/libraries/haskell/repa-examples/default.nix index 571ef7f3d16..48678480a35 100644 --- a/pkgs/development/libraries/haskell/repa-examples/default.nix +++ b/pkgs/development/libraries/haskell/repa-examples/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, llvm, QuickCheck, random, repa, repaAlgorithms, repaIo , vector }: diff --git a/pkgs/development/libraries/haskell/repa-io/default.nix b/pkgs/development/libraries/haskell/repa-io/default.nix index 563fe84193b..b42d165c512 100644 --- a/pkgs/development/libraries/haskell/repa-io/default.nix +++ b/pkgs/development/libraries/haskell/repa-io/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bmp, repa, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix index ceb6fcadb0f..627b0572d98 100644 --- a/pkgs/development/libraries/haskell/repa/default.nix +++ b/pkgs/development/libraries/haskell/repa/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/repr/default.nix b/pkgs/development/libraries/haskell/repr/default.nix index c44735eda00..96a460fcb18 100644 --- a/pkgs/development/libraries/haskell/repr/default.nix +++ b/pkgs/development/libraries/haskell/repr/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, dstring, random, stringCombinators }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix new file mode 100644 index 00000000000..47950176a49 --- /dev/null +++ b/pkgs/development/libraries/haskell/resource-pool-catchio/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hashable, MonadCatchIOTransformers, stm, time +, transformers, transformersBase, vector +}: + +cabal.mkDerivation (self: { + pname = "resource-pool-catchio"; + version = "0.2.1.0"; + sha256 = "0g9r6hnn01n3p2ikcfkfc4afh83pzam29zal3k2ivajpl3kramsw"; + buildDepends = [ + hashable MonadCatchIOTransformers stm time transformers + transformersBase vector + ]; + meta = { + homepage = "http://github.com/norm2782/pool"; + description = "Fork of resource-pool, with a MonadCatchIO constraint"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index 72178ddc1cf..f88203b1ce2 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, monadControl, stm, time, transformers , transformersBase, vector }: diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 60358a228d2..39ea2050cca 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, hspec, liftedBase, mmorph, monadControl, mtl , transformers, transformersBase }: diff --git a/pkgs/development/libraries/haskell/rest-client/default.nix b/pkgs/development/libraries/haskell/rest-client/default.nix new file mode 100644 index 00000000000..0712742717b --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-client/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aesonUtils, caseInsensitive, dataDefault +, exceptionTransformers, httpConduit, httpTypes, hxt +, hxtPickleUtils, monadControl, mtl, primitive, resourcet +, restTypes, tostring, transformersBase, uriEncode, utf8String +}: + +cabal.mkDerivation (self: { + pname = "rest-client"; + version = "0.4"; + sha256 = "18mvmp4c5zznph8q5ash6224wig5kwvb6v19dkn39n4l72cdq7wm"; + buildDepends = [ + aesonUtils caseInsensitive dataDefault exceptionTransformers + httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive + resourcet restTypes tostring transformersBase uriEncode utf8String + ]; + meta = { + description = "Utility library for use in generated API client libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix new file mode 100644 index 00000000000..74371730569 --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -0,0 +1,26 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonUtils, either, errors, fclabels, HUnit, hxt +, hxtPickleUtils, jsonSchema, mtl, multipart, random, restStringmap +, restTypes, safe, split, testFramework, testFrameworkHunit, text +, transformers, unorderedContainers, uriEncode, utf8String, uuid +}: + +cabal.mkDerivation (self: { + pname = "rest-core"; + version = "0.31.1"; + sha256 = "1cx1zmy1zr43n9nlrbar828izccpkvrvjkrda03ra9fkcjgd6qy6"; + buildDepends = [ + aeson aesonUtils either errors fclabels hxt hxtPickleUtils + jsonSchema mtl multipart random restStringmap restTypes safe split + text transformers unorderedContainers uriEncode utf8String uuid + ]; + testDepends = [ + HUnit mtl testFramework testFrameworkHunit unorderedContainers + ]; + meta = { + description = "Rest API library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix new file mode 100644 index 00000000000..fb27f40cc2b --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, blazeHtml, Cabal, codeBuilder, fclabels, filepath +, hashable, haskellSrcExts, hslogger, HStringTemplate, HUnit, hxt +, jsonSchema, restCore, safe, scientific, split, tagged +, testFramework, testFrameworkHunit, text, uniplate +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "rest-gen"; + version = "0.14.2"; + sha256 = "1hmf77hs3pp6lf4glh3lbbwfjr029js185v69bk8ycr1c4ib8nbp"; + buildDepends = [ + aeson blazeHtml Cabal codeBuilder fclabels filepath hashable + haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore + safe scientific split tagged text uniplate unorderedContainers + vector + ]; + testDepends = [ + haskellSrcExts HUnit restCore testFramework testFrameworkHunit + ]; + meta = { + description = "Documentation and client generation from rest definition"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix new file mode 100644 index 00000000000..74c5f2a06cb --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, happstackServer, mtl, restCore, restGen, utf8String }: + +cabal.mkDerivation (self: { + pname = "rest-happstack"; + version = "0.2.10"; + sha256 = "1np8y0v6jnk2lw0aqlzb9dn1vlk8cg75xrhkjmm6qh0z90fy3p6z"; + buildDepends = [ happstackServer mtl restCore restGen utf8String ]; + meta = { + description = "Rest driver for Happstack"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix new file mode 100644 index 00000000000..5305c2d113f --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-snap/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, caseInsensitive, restCore, safe, snapCore +, unorderedContainers, uriEncode, utf8String +}: + +cabal.mkDerivation (self: { + pname = "rest-snap"; + version = "0.1.17.12"; + sha256 = "0hhpscdbph34psfn2h1g0znds0cz7ja9byr6bg7jmj0h86plz8al"; + buildDepends = [ + caseInsensitive restCore safe snapCore unorderedContainers + uriEncode utf8String + ]; + meta = { + description = "Rest driver for Snap"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-stringmap/default.nix b/pkgs/development/libraries/haskell/rest-stringmap/default.nix new file mode 100644 index 00000000000..833b79f0df5 --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-stringmap/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, hashable, hxt, jsonSchema, tagged, text, tostring +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "rest-stringmap"; + version = "0.2.0.2"; + sha256 = "0nzkc09679c2mz3amh1avk2kfjpqbhbxsr0r9zvgcs71gqkal2mz"; + buildDepends = [ + aeson hashable hxt jsonSchema tagged text tostring + unorderedContainers + ]; + meta = { + description = "Maps with stringy keys that can be transcoded to JSON and XML"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix new file mode 100644 index 00000000000..e7b5ab77962 --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, genericAeson, hxt, jsonSchema, mtl, regular +, regularXmlpickler, restStringmap, text, uuid +}: + +cabal.mkDerivation (self: { + pname = "rest-types"; + version = "1.10.1"; + sha256 = "0i4y1s35ybly1nayqj9c2zqwikpxnzjamq24qbhg0lpqr0dpc1rg"; + buildDepends = [ + aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler + restStringmap text uuid + ]; + meta = { + description = "Silk Rest Framework Types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix new file mode 100644 index 00000000000..7ddb500265b --- /dev/null +++ b/pkgs/development/libraries/haskell/rest-wai/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, caseInsensitive, httpTypes, mimeTypes, mtl, restCore +, restTypes, text, unorderedContainers, utf8String, wai +}: + +cabal.mkDerivation (self: { + pname = "rest-wai"; + version = "0.1.0.2"; + sha256 = "06wnazy0262b2875q4km2xy9zz7l681vlfj3ny1ha9valnqr3q6w"; + buildDepends = [ + caseInsensitive httpTypes mimeTypes mtl restCore restTypes text + unorderedContainers utf8String wai + ]; + meta = { + description = "Rest driver for WAI applications"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix index f262663205a..00453628d33 100644 --- a/pkgs/development/libraries/haskell/rethinkdb/default.nix +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, dataDefault, mtl, network , protocolBuffers, protocolBuffersDescriptor, text, time , unorderedContainers, utf8String, vector diff --git a/pkgs/development/libraries/haskell/retry/default.nix b/pkgs/development/libraries/haskell/retry/default.nix index b78fc66ca06..f3fe5343e52 100644 --- a/pkgs/development/libraries/haskell/retry/default.nix +++ b/pkgs/development/libraries/haskell/retry/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, exceptions, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rex/default.nix b/pkgs/development/libraries/haskell/rex/default.nix index c590b6023c0..2f2d3ca89e5 100644 --- a/pkgs/development/libraries/haskell/rex/default.nix +++ b/pkgs/development/libraries/haskell/rex/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, haskellSrcMeta, pcreLight }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rfc5051/default.nix b/pkgs/development/libraries/haskell/rfc5051/default.nix index 09b5d3e229e..45a7f3c3da3 100644 --- a/pkgs/development/libraries/haskell/rfc5051/default.nix +++ b/pkgs/development/libraries/haskell/rfc5051/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix index a325c9e8664..c6534ff0cf4 100644 --- a/pkgs/development/libraries/haskell/robots-txt/default.nix +++ b/pkgs/development/libraries/haskell/robots-txt/default.nix @@ -1,10 +1,13 @@ -{ cabal, attoparsec, heredoc, hspec, QuickCheck, transformers }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, heredoc, hspec, QuickCheck, time, transformers +}: cabal.mkDerivation (self: { pname = "robots-txt"; - version = "0.4.0.0"; - sha256 = "1z0bn4v6fx0nx1hr4bbxi5k2c8bv6x3d4pywpav67m5pswxb2yp7"; - buildDepends = [ attoparsec ]; + version = "0.4.1.0"; + sha256 = "1q18pgilrwppmd8d7pby3p6qgk47alzmd8izqspk7n4h4agrscn4"; + buildDepends = [ attoparsec time ]; testDepends = [ attoparsec heredoc hspec QuickCheck transformers ]; meta = { homepage = "http://github.com/meanpath/robots"; diff --git a/pkgs/development/libraries/haskell/rosezipper/default.nix b/pkgs/development/libraries/haskell/rosezipper/default.nix index 3c25392e7c9..736deff0db0 100644 --- a/pkgs/development/libraries/haskell/rosezipper/default.nix +++ b/pkgs/development/libraries/haskell/rosezipper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/rvar/default.nix b/pkgs/development/libraries/haskell/rvar/default.nix index 6f2ed95ab63..a0d4342d269 100644 --- a/pkgs/development/libraries/haskell/rvar/default.nix +++ b/pkgs/development/libraries/haskell/rvar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, MonadPrompt, mtl, randomSource, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/safe/default.nix b/pkgs/development/libraries/haskell/safe/default.nix index 49c77c5ea26..21f2140295a 100644 --- a/pkgs/development/libraries/haskell/safe/default.nix +++ b/pkgs/development/libraries/haskell/safe/default.nix @@ -1,12 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "safe"; - version = "0.3.4"; - sha256 = "0mwdaj0sjvqkgg077x1d896xphx64yrjvwbdhv7khdk3rh0vfl64"; + version = "0.3.7"; + sha256 = "0rw8mjarwl7rwc6fczq0zxlp1nlb6r1rk71whwziwi032hgc8561"; meta = { homepage = "http://community.haskell.org/~ndm/safe/"; - description = "Library for safe (pattern match free) functions"; + description = "Library of safe (exception free) functions"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.andres ]; diff --git a/pkgs/development/libraries/haskell/safecopy/default.nix b/pkgs/development/libraries/haskell/safecopy/default.nix index 5d761c69349..6faa46d20bb 100644 --- a/pkgs/development/libraries/haskell/safecopy/default.nix +++ b/pkgs/development/libraries/haskell/safecopy/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, lens, quickcheckInstances, tasty, tastyQuickcheck , text, time, vector }: diff --git a/pkgs/development/libraries/haskell/sample-frame/default.nix b/pkgs/development/libraries/haskell/sample-frame/default.nix index 8e9478ed5e2..18fcb238726 100644 --- a/pkgs/development/libraries/haskell/sample-frame/default.nix +++ b/pkgs/development/libraries/haskell/sample-frame/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, storableRecord }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index a4450bdc892..0a21f13dbc2 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -1,13 +1,17 @@ -{ cabal, deepseq, filepath, HUnit, mtl, QuickCheck, random, syb }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, deepseq, filepath, HUnit, mtl, QuickCheck, random +, syb +}: cabal.mkDerivation (self: { pname = "sbv"; - version = "3.0"; - sha256 = "16k9f0x4amg7mm8ib22nyk1rngrbf9311gl2m15hbdq49jp8ik9i"; + version = "3.1"; + sha256 = "19rn5ynqqjz0zw7gcb0y4clzxxnmq56a2qx369mz283455l86h5j"; isLibrary = true; isExecutable = true; buildDepends = [ - deepseq filepath HUnit mtl QuickCheck random syb + async deepseq filepath HUnit mtl QuickCheck random syb ]; testDepends = [ filepath HUnit syb ]; meta = { diff --git a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix index 523bfce62b5..c3f9a7e7a3a 100644 --- a/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix +++ b/pkgs/development/libraries/haskell/scientific/0.2.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck , text }: diff --git a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix index 467f2f1d160..c2563259ce0 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.2.1.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.0.nix @@ -1,14 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hashable, QuickCheck, smallcheck, tasty -, tastyAntXml, tastyQuickcheck, tastySmallcheck, text +, tastyAntXml, tastyHunit, tastyQuickcheck, tastySmallcheck, text }: cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.2.1"; - sha256 = "0z0k0dqmv6a3spgl48yl00a55niv0gqjy906sh4r8xfpsabzl88s"; + version = "0.3.3.0"; + sha256 = "1kj49ibq53m7cfs9pq396l4fbqnarqzay7a65rmsrzi2vz15parv"; buildDepends = [ deepseq hashable text ]; testDepends = [ - QuickCheck smallcheck tasty tastyAntXml tastyQuickcheck + QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck tastySmallcheck text ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/scotty-hastache/default.nix b/pkgs/development/libraries/haskell/scotty-hastache/default.nix index 7f10ad2d68f..9f5c652d22c 100644 --- a/pkgs/development/libraries/haskell/scotty-hastache/default.nix +++ b/pkgs/development/libraries/haskell/scotty-hastache/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hastache, httpTypes, mtl, scotty, text, wai , warp }: diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 398d3a1dfb8..91876f7e318 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,17 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, hspec, httpTypes, mtl, regexCompat, text, transformers, wai -, waiExtra, warp +, hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat +, text, transformers, transformersBase, wai, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.8.0"; - sha256 = "07198m8rsavdqr51abxsrmi8jail6h4ldzrr9s47il1djjba6lhh"; + version = "0.8.2"; + sha256 = "07vjdj26380inlyi350mdifm7v1dpbc56041vi2czf5zzhx97qb0"; buildDepends = [ aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes - mtl regexCompat text transformers wai waiExtra warp + monadControl mtl regexCompat text transformers transformersBase wai + waiExtra warp ]; - testDepends = [ hspec httpTypes wai waiExtra ]; + testDepends = [ hspec httpTypes liftedBase wai waiExtra ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; diff --git a/pkgs/development/libraries/haskell/scrypt/default.nix b/pkgs/development/libraries/haskell/scrypt/default.nix index 6caf51edc1e..c0d9e2df2e8 100644 --- a/pkgs/development/libraries/haskell/scrypt/default.nix +++ b/pkgs/development/libraries/haskell/scrypt/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, entropy, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix index 5b6fc4e95ca..fddba193457 100644 --- a/pkgs/development/libraries/haskell/securemem/default.nix +++ b/pkgs/development/libraries/haskell/securemem/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, byteable }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix index cb8ed865da3..a12c8c449c5 100644 --- a/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoid-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, semigroupoids }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/semigroupoids/default.nix b/pkgs/development/libraries/haskell/semigroupoids/default.nix index 455396564ec..97389362682 100644 --- a/pkgs/development/libraries/haskell/semigroupoids/default.nix +++ b/pkgs/development/libraries/haskell/semigroupoids/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, contravariant, distributive, semigroups , transformers }: diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 21cbc893e22..4d39b97bbae 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, nats, text, unorderedContainers }: cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15"; - sha256 = "1fkinmjyx7r39c8hf8f6n9zgn6m7c2y7l0san43s4g2cfg8pxn5s"; + version = "0.15.1"; + sha256 = "1vacnw598pl9acbcjjblrpdmjhmj3wz1ifrn9ki4q7yrsh4ml7mc"; buildDepends = [ hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; diff --git a/pkgs/development/libraries/haskell/sendfile/default.nix b/pkgs/development/libraries/haskell/sendfile/default.nix index dc1f24757af..abc80aa17f8 100644 --- a/pkgs/development/libraries/haskell/sendfile/default.nix +++ b/pkgs/development/libraries/haskell/sendfile/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/setenv/default.nix b/pkgs/development/libraries/haskell/setenv/default.nix index 4b3e75a1731..567c50ecb2a 100644 --- a/pkgs/development/libraries/haskell/setenv/default.nix +++ b/pkgs/development/libraries/haskell/setenv/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/setlocale/default.nix b/pkgs/development/libraries/haskell/setlocale/default.nix index 09ffc7159a4..4094fc22110 100644 --- a/pkgs/development/libraries/haskell/setlocale/default.nix +++ b/pkgs/development/libraries/haskell/setlocale/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index f07e0f54b9b..610c7c22590 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, deepseq, filepath, hashable, QuickCheck, random , time, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.13.1"; - sha256 = "00dvf1ydfgpnkv09fywsvyn0sphjwdrqhvkc21axj580ykbqxrn7"; + version = "0.13.2"; + sha256 = "0ibq0y0dxxahfwgcvamjfhbl5mrqmj7ryzf8bfmqky843fg7dyna"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix index 349b5d6cdbd..0fdba423332 100644 --- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix index 43af98f65aa..7ea060c5b7f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-i18n/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix index 40e7cd17b23..c3437690d8c 100644 --- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix index b299b7c7030..8acba44ed0f 100644 --- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, shakespeare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix index 54b93e10923..de6855ee19e 100644 --- a/pkgs/development/libraries/haskell/shakespeare/default.nix +++ b/pkgs/development/libraries/haskell/shakespeare/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeHtml, blazeMarkup, exceptions, hspec, HUnit , parsec, systemFileio, systemFilepath, text, time, transformers }: cabal.mkDerivation (self: { pname = "shakespeare"; - version = "2.0.0.3"; - sha256 = "12dmhcv404bh7kn04d175bj2b0fadz4sjypwsq151mlhakr13x85"; + version = "2.0.1"; + sha256 = "1h1b7p4czdzrxb77515vqnck3rj3yw35h2ds6gzxzp7pdxprds27"; buildDepends = [ aeson blazeHtml blazeMarkup exceptions parsec systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/shellish/default.nix b/pkgs/development/libraries/haskell/shellish/default.nix new file mode 100644 index 00000000000..cdf2e3a3463 --- /dev/null +++ b/pkgs/development/libraries/haskell/shellish/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, mtl, strict, time, unixCompat }: + +cabal.mkDerivation (self: { + pname = "shellish"; + version = "0.1.4"; + sha256 = "1ldwid270mwyky6zmggbvn72hvs4s39hhf2zj8r0jahxnwlpbfan"; + buildDepends = [ filepath mtl strict time unixCompat ]; + meta = { + homepage = "http://repos.mornfall.net/shellish"; + description = "shell-/perl- like (systems) programming in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shellmate/default.nix b/pkgs/development/libraries/haskell/shellmate/default.nix new file mode 100644 index 00000000000..6f059a75352 --- /dev/null +++ b/pkgs/development/libraries/haskell/shellmate/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, temporary, time, transformers }: + +cabal.mkDerivation (self: { + pname = "shellmate"; + version = "0.1.6"; + sha256 = "17fpl0h58cw5hp6jzrajkl629mw2c6x15cmlcbdxqk9xlxqrg4hr"; + buildDepends = [ filepath temporary time transformers ]; + meta = { + homepage = "http://github.com/valderman/shellmate"; + description = "Simple interface for shell scripting in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix index d3ef289042d..05757172d9a 100644 --- a/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix +++ b/pkgs/development/libraries/haskell/shelly/0.15.4.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, mtl, systemFileio, systemFilepath, text , time, unixCompat }: diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index a37fb044bc0..49bbcdd67e4 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, enclosedExceptions, exceptions, liftedAsync , liftedBase, monadControl, mtl, systemFileio, systemFilepath, text , time, transformers, transformersBase, unixCompat @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.4"; - sha256 = "1jxw3c25n7azvfyj9vark9149sk36d01pfij6lgamhjs28mb860d"; + version = "1.5.4.1"; + sha256 = "0h38j6vkdgaddj7xardyywibdj5w0wryqxwwpc62idgzlp7mgpb2"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers diff --git a/pkgs/development/libraries/haskell/show/default.nix b/pkgs/development/libraries/haskell/show/default.nix index 28ed4371264..2ea6186cab1 100644 --- a/pkgs/development/libraries/haskell/show/default.nix +++ b/pkgs/development/libraries/haskell/show/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/silently/default.nix b/pkgs/development/libraries/haskell/silently/default.nix index fcd7a0a872a..619f8614f09 100644 --- a/pkgs/development/libraries/haskell/silently/default.nix +++ b/pkgs/development/libraries/haskell/silently/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, nanospec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/simple-conduit/default.nix b/pkgs/development/libraries/haskell/simple-conduit/default.nix new file mode 100644 index 00000000000..a55267d426b --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-conduit/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, chunkedData, either, exceptions, filepath +, free, liftedAsync, liftedBase, mmorph, monadControl +, monoTraversable, mtl, mwcRandom, primitive, semigroups, stm +, streamingCommons, text, transformers, transformersBase, vector +}: + +cabal.mkDerivation (self: { + pname = "simple-conduit"; + version = "0.5.0"; + sha256 = "0fbm1nv9190p1b038p6zxmw042cgm5jgkfbhscw1fslgzja90iyz"; + buildDepends = [ + bifunctors chunkedData either exceptions filepath free liftedAsync + liftedBase mmorph monadControl monoTraversable mtl mwcRandom + primitive semigroups stm streamingCommons text transformers + transformersBase vector + ]; + meta = { + homepage = "http://github.com/jwiegley/simple-conduit"; + description = "A simple streaming I/O library based on monadic folds"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/simple-reflect/default.nix b/pkgs/development/libraries/haskell/simple-reflect/default.nix index 121677b79f1..6ff9d26dc74 100644 --- a/pkgs/development/libraries/haskell/simple-reflect/default.nix +++ b/pkgs/development/libraries/haskell/simple-reflect/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 52c5fd7fe68..ea5ffdc4561 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, conduitExtra, hspec, HUnit, network , networkConduit, resourcet }: cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.14"; - sha256 = "00k9cachx7y4811b71f8p468kx018hzvpvw6jgf7zmjhc9v922ni"; + version = "0.2.15"; + sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9"; buildDepends = [ network resourcet ]; testDepends = [ conduit conduitExtra hspec HUnit network networkConduit resourcet diff --git a/pkgs/development/libraries/haskell/simple-sql-parser/default.nix b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix new file mode 100644 index 00000000000..71cd2f4bbd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/simple-sql-parser/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit, mtl, parsec, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "simple-sql-parser"; + version = "0.4.0"; + sha256 = "0mkc2x6x061qdcnaifig26jmq86rvdvp1xjmzn8g2qf0v3dw18hl"; + isLibrary = true; + isExecutable = true; + buildDepends = [ mtl parsec ]; + testDepends = [ + HUnit mtl parsec testFramework testFrameworkHunit + ]; + meta = { + homepage = "http://jakewheat.github.io/simple-sql-parser/"; + description = "A parser for SQL queries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/singletons/default.nix b/pkgs/development/libraries/haskell/singletons/default.nix index aeace4d3fce..c4074b9d62c 100644 --- a/pkgs/development/libraries/haskell/singletons/default.nix +++ b/pkgs/development/libraries/haskell/singletons/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, constraints, filepath, mtl, tasty, tastyGolden , thDesugar }: diff --git a/pkgs/development/libraries/haskell/sized-types/default.nix b/pkgs/development/libraries/haskell/sized-types/default.nix index 3fc69552e11..23f4fa7fa1c 100644 --- a/pkgs/development/libraries/haskell/sized-types/default.nix +++ b/pkgs/development/libraries/haskell/sized-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, singletons }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 2824c1c8f1c..817c3acb828 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, cryptoApi, filepath, hspec, tagged }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index e81a8872f7a..a3f7d335e89 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, logict, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/smtLib/default.nix b/pkgs/development/libraries/haskell/smtLib/default.nix index e1363d9063a..49443a76c2e 100644 --- a/pkgs/development/libraries/haskell/smtLib/default.nix +++ b/pkgs/development/libraries/haskell/smtLib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/smtp-mail/default.nix b/pkgs/development/libraries/haskell/smtp-mail/default.nix index 80f18da4c56..ab97608541d 100644 --- a/pkgs/development/libraries/haskell/smtp-mail/default.nix +++ b/pkgs/development/libraries/haskell/smtp-mail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base16Bytestring, base64Bytestring, cryptohash, filepath , mimeMail, network, text }: diff --git a/pkgs/development/libraries/haskell/smtps-gmail/default.nix b/pkgs/development/libraries/haskell/smtps-gmail/default.nix index 2618b77be28..fbab444444b 100644 --- a/pkgs/development/libraries/haskell/smtps-gmail/default.nix +++ b/pkgs/development/libraries/haskell/smtps-gmail/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, cprngAes, dataDefault, filepath , mimeMail, network, stringsearch, text, tls }: diff --git a/pkgs/development/libraries/haskell/snap-blaze/default.nix b/pkgs/development/libraries/haskell/snap-blaze/default.nix index 2b7444cd154..9dd9bf382bd 100644 --- a/pkgs/development/libraries/haskell/snap-blaze/default.nix +++ b/pkgs/development/libraries/haskell/snap-blaze/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeHtml, snapCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index 338e2c4693f..f62b484328c 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, caseInsensitive, hashable, network, snap, text , transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "snap-cors"; - version = "1.2.4"; - sha256 = "0mg5sjvrcs60s8k28vgi49vbgfpswkcd7i7yyfi1n1649vqb69mb"; + version = "1.2.5"; + sha256 = "1zjvvi1prskkb26yp51j09gfkhpw0ggj69d89098yq0sl6d0vy1c"; buildDepends = [ attoparsec caseInsensitive hashable network snap text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/snap-web-routes/default.nix b/pkgs/development/libraries/haskell/snap-web-routes/default.nix new file mode 100644 index 00000000000..71b8c3c49da --- /dev/null +++ b/pkgs/development/libraries/haskell/snap-web-routes/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, heist, mtl, snap, snapCore, text, webRoutes, xmlhtml }: + +cabal.mkDerivation (self: { + pname = "snap-web-routes"; + version = "0.5.0.0"; + sha256 = "1ml0b759k2n9bd2x4akz4dfyk8ywnpgrdlcymng4vhjxbzngnniv"; + buildDepends = [ heist mtl snap snapCore text webRoutes xmlhtml ]; + meta = { + homepage = "https://github.com/lukerandall/snap-web-routes"; + description = "Type safe URLs for Snap"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snap/core.nix b/pkgs/development/libraries/haskell/snap/core.nix index d208cadf8cf..a839afdebe7 100644 --- a/pkgs/development/libraries/haskell/snap/core.nix +++ b/pkgs/development/libraries/haskell/snap/core.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecEnumerator, blazeBuilder , blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq , enumerator, filepath, hashable, HUnit, MonadCatchIOTransformers diff --git a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix index f6dbf733265..3b59fb5ef55 100644 --- a/pkgs/development/libraries/haskell/snap/loader-dynamic.nix +++ b/pkgs/development/libraries/haskell/snap/loader-dynamic.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, directoryTree, hint, mtl, snapCore, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap/loader-static.nix b/pkgs/development/libraries/haskell/snap/loader-static.nix index c7fb496c036..4b74ed294dc 100644 --- a/pkgs/development/libraries/haskell/snap/loader-static.nix +++ b/pkgs/development/libraries/haskell/snap/loader-static.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snap/server.nix b/pkgs/development/libraries/haskell/snap/server.nix index a59252fb38c..d2278f329f4 100644 --- a/pkgs/development/libraries/haskell/snap/server.nix +++ b/pkgs/development/libraries/haskell/snap/server.nix @@ -1,5 +1,7 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecEnumerator, blazeBuilder -, blazeBuilderEnumerator, caseInsensitive, enumerator +, blazeBuilderEnumerator, caseInsensitive, enumerator, HsOpenSSL , MonadCatchIOTransformers, mtl, network, snapCore, text, time , unixCompat }: @@ -10,9 +12,13 @@ cabal.mkDerivation (self: { sha256 = "09399vlqgic0iwmx31c01bjpbdblw8gayxnz71lwzkixqibkbbip"; buildDepends = [ attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator - caseInsensitive enumerator MonadCatchIOTransformers mtl network - snapCore text time unixCompat + caseInsensitive enumerator HsOpenSSL MonadCatchIOTransformers mtl + network snapCore text time unixCompat ]; + configureFlags = "-fopenssl"; + patchPhase = '' + sed -i -e 's|HsOpenSSL >= .*|HsOpenSSL|' snap-server.cabal + ''; meta = { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 435bccd9cb5..189750bd446 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, cereal, clientsession, comonad , configurator, directoryTree, dlist, errors, filepath, hashable , heist, lens, logict, MonadCatchIOTransformers, mtl, mwcRandom @@ -8,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.2.7"; - sha256 = "1vw8c48rb1clahm1yw951si9dv9mk0gfldxvk3jd7rvsfzg97s4z"; + version = "0.13.2.8"; + sha256 = "1jrnh1raw2jrl04l54f5w5xfp9yyb9bj0ly9v1baqkiggswacbzg"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix index 4d66f69acd6..cdbca726574 100644 --- a/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-acid-state/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, acidState, snap, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix new file mode 100644 index 00000000000..e30a2c98dd4 --- /dev/null +++ b/pkgs/development/libraries/haskell/snaplet-postgresql-simple/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, clientsession, configurator, errors +, MonadCatchIOTransformers, mtl, postgresqlSimple +, resourcePoolCatchio, snap, text, transformers +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "snaplet-postgresql-simple"; + version = "0.5"; + sha256 = "0pzn0lg1slrllrrx1n9s1kp1pmq2ahrkjypcwnnld8zxzvz4g5jm"; + buildDepends = [ + clientsession configurator errors MonadCatchIOTransformers mtl + postgresqlSimple resourcePoolCatchio snap text transformers + unorderedContainers + ]; + meta = { + homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; + description = "postgresql-simple snaplet for the Snap Framework"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/snaplet-redis/default.nix b/pkgs/development/libraries/haskell/snaplet-redis/default.nix index 83a82ac80ce..e0cb67e120a 100644 --- a/pkgs/development/libraries/haskell/snaplet-redis/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-redis/default.nix @@ -1,19 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, configurator, hedis, lens, mtl, network, snap , transformers }: cabal.mkDerivation (self: { pname = "snaplet-redis"; - version = "0.1.3.1"; - sha256 = "1aprz9rxs01a86vfr8s7mjydafdfljg89grl7i43vmsw927izc6k"; + version = "0.1.3.2"; + sha256 = "0554farc76ncbynzks4ryi7a2nbahsgnjvazmw5n9b79cp207bjf"; buildDepends = [ configurator hedis lens mtl network snap transformers ]; + jailbreak = true; meta = { homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - jailbreak = true; }) diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix index 1f74f646cae..1024b2ac4ee 100644 --- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, configurator, heist, mtl, snap, stripe, text, textFormat , transformers, xmlhtml }: diff --git a/pkgs/development/libraries/haskell/snowball/default.nix b/pkgs/development/libraries/haskell/snowball/default.nix index 36a4231109d..d24b27f781e 100644 --- a/pkgs/development/libraries/haskell/snowball/default.nix +++ b/pkgs/development/libraries/haskell/snowball/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, QuickCheck, quickcheckInstances, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, text, textIcu }: diff --git a/pkgs/development/libraries/haskell/socket-activation/default.nix b/pkgs/development/libraries/haskell/socket-activation/default.nix index 741b12bf463..affc683e18a 100644 --- a/pkgs/development/libraries/haskell/socket-activation/default.nix +++ b/pkgs/development/libraries/haskell/socket-activation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, network, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix new file mode 100644 index 00000000000..a91832a0ad0 --- /dev/null +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, engineIo, mtl, stm, text, transformers +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "socket-io"; + version = "1.0.1"; + sha256 = "0257c5wf6b9rmprqq5q5d7fih4s2szwv98w16ggl61p8khf5d2qs"; + buildDepends = [ + aeson attoparsec engineIo mtl stm text transformers + unorderedContainers vector + ]; + meta = { + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/socks/default.nix b/pkgs/development/libraries/haskell/socks/default.nix index 1953e3436ee..d0233753532 100644 --- a/pkgs/development/libraries/haskell/socks/default.nix +++ b/pkgs/development/libraries/haskell/socks/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, network }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sourcemap/default.nix b/pkgs/development/libraries/haskell/sourcemap/default.nix index ce0c89d4596..e108bb590bb 100644 --- a/pkgs/development/libraries/haskell/sourcemap/default.nix +++ b/pkgs/development/libraries/haskell/sourcemap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, text, unorderedContainers, utf8String }: diff --git a/pkgs/development/libraries/haskell/sparse/default.nix b/pkgs/development/libraries/haskell/sparse/default.nix index f498da21939..c2fbf368f53 100644 --- a/pkgs/development/libraries/haskell/sparse/default.nix +++ b/pkgs/development/libraries/haskell/sparse/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, contravariant, deepseq, doctest, filepath, hlint , hybridVectors, lens, linear, mtl, primitive, QuickCheck , semigroups, simpleReflect, testFramework diff --git a/pkgs/development/libraries/haskell/spawn/default.nix b/pkgs/development/libraries/haskell/spawn/default.nix index a69b7fd2641..010f51a5251 100644 --- a/pkgs/development/libraries/haskell/spawn/default.nix +++ b/pkgs/development/libraries/haskell/spawn/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/speculation/default.nix b/pkgs/development/libraries/haskell/speculation/default.nix index 2cbad477b04..2386d0ad54f 100644 --- a/pkgs/development/libraries/haskell/speculation/default.nix +++ b/pkgs/development/libraries/haskell/speculation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/split/0.1.4.3.nix b/pkgs/development/libraries/haskell/split/0.1.4.3.nix index ad0df5c2cb0..d9a39e98436 100644 --- a/pkgs/development/libraries/haskell/split/0.1.4.3.nix +++ b/pkgs/development/libraries/haskell/split/0.1.4.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/split/0.2.1.1.nix b/pkgs/development/libraries/haskell/split/0.2.1.1.nix index 0fb28b53ac9..13146b02bac 100644 --- a/pkgs/development/libraries/haskell/split/0.2.1.1.nix +++ b/pkgs/development/libraries/haskell/split/0.2.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/split/0.2.2.nix b/pkgs/development/libraries/haskell/split/0.2.2.nix index 2d768e2e71d..fb7fce607d8 100644 --- a/pkgs/development/libraries/haskell/split/0.2.2.nix +++ b/pkgs/development/libraries/haskell/split/0.2.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/spoon/default.nix b/pkgs/development/libraries/haskell/spoon/default.nix index bc631e69d52..436291cf8dc 100644 --- a/pkgs/development/libraries/haskell/spoon/default.nix +++ b/pkgs/development/libraries/haskell/spoon/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/sqlite-simple/default.nix b/pkgs/development/libraries/haskell/sqlite-simple/default.nix index 515f22834ae..94d8d4409c9 100644 --- a/pkgs/development/libraries/haskell/sqlite-simple/default.nix +++ b/pkgs/development/libraries/haskell/sqlite-simple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base16Bytestring, blazeBuilder, blazeTextual , directSqlite, HUnit, text, time, transformers }: diff --git a/pkgs/development/libraries/haskell/srcloc/default.nix b/pkgs/development/libraries/haskell/srcloc/default.nix index f652ed001e4..5e401092080 100644 --- a/pkgs/development/libraries/haskell/srcloc/default.nix +++ b/pkgs/development/libraries/haskell/srcloc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stateref/default.nix b/pkgs/development/libraries/haskell/stateref/default.nix index bc3913f6726..0534835c2b1 100644 --- a/pkgs/development/libraries/haskell/stateref/default.nix +++ b/pkgs/development/libraries/haskell/stateref/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/statestack/default.nix b/pkgs/development/libraries/haskell/statestack/default.nix index c073e00be17..dac89bd2ef9 100644 --- a/pkgs/development/libraries/haskell/statestack/default.nix +++ b/pkgs/development/libraries/haskell/statestack/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/statistics/default.nix b/pkgs/development/libraries/haskell/statistics/default.nix index 485a5fe0c30..3d879f12b9d 100644 --- a/pkgs/development/libraries/haskell/statistics/default.nix +++ b/pkgs/development/libraries/haskell/statistics/default.nix @@ -1,4 +1,6 @@ -{ cabal, binary, deepseq, erf, HUnit, ieee754, mathFunctions +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, binary, deepseq, erf, HUnit, ieee754, mathFunctions , monadPar, mwcRandom, primitive, QuickCheck, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, vector , vectorAlgorithms, vectorBinaryInstances @@ -6,10 +8,10 @@ cabal.mkDerivation (self: { pname = "statistics"; - version = "0.11.0.3"; - sha256 = "184lzivqjjj69pxcnr5ibxjqikypfl5nd63i44qgwdhwyvcaqdh3"; + version = "0.13.1.0"; + sha256 = "0y46fna0kqs8bsqbf3v1k9ppq3njd5kxf1qlvvmphydpi3x038nd"; buildDepends = [ - binary deepseq erf mathFunctions monadPar mwcRandom primitive + aeson binary deepseq erf mathFunctions monadPar mwcRandom primitive vector vectorAlgorithms vectorBinaryInstances ]; testDepends = [ diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix index 604edc83139..bb1ebb1b9d8 100644 --- a/pkgs/development/libraries/haskell/statvfs/default.nix +++ b/pkgs/development/libraries/haskell/statvfs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stb-image/default.nix b/pkgs/development/libraries/haskell/stb-image/default.nix index 1b1f1ba705b..e27c0884835 100644 --- a/pkgs/development/libraries/haskell/stb-image/default.nix +++ b/pkgs/development/libraries/haskell/stb-image/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bitmap }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm-chans/default.nix b/pkgs/development/libraries/haskell/stm-chans/default.nix index 2b8c9d1080a..8455aca477b 100644 --- a/pkgs/development/libraries/haskell/stm-chans/default.nix +++ b/pkgs/development/libraries/haskell/stm-chans/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix index deb76355f4a..cebb79c3344 100644 --- a/pkgs/development/libraries/haskell/stm-conduit/default.nix +++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, cereal, cerealConduit, conduit, conduitExtra, HUnit , liftedAsync, liftedBase, monadControl, monadLoops, QuickCheck , resourcet, stm, stmChans, testFramework, testFrameworkHunit @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "stm-conduit"; - version = "2.5.0"; - sha256 = "1pxs1ggyyjm4x06cirdcjaqzvz3964spv34fcf0q9ddhxm5kb30q"; + version = "2.5.1"; + sha256 = "08cnr92c442b1in46xcklni35597hbsggw97arq2f9w5sfir341q"; buildDepends = [ async cereal cerealConduit conduit conduitExtra liftedAsync liftedBase monadControl monadLoops resourcet stm stmChans diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix new file mode 100644 index 00000000000..d93bd1a03a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, focus, free, hashable, HTF, lochTh, mtl, placeholders +, primitive, QuickCheck, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "stm-containers"; + version = "0.1.2"; + sha256 = "1rzxjspf0lzmviixnxv9f2wjxqhwv65fb1nws915ghs1sj774gab"; + buildDepends = [ focus hashable lochTh placeholders primitive ]; + testDepends = [ + focus free hashable HTF lochTh mtl placeholders primitive + QuickCheck unorderedContainers + ]; + doCheck = false; + meta = { + homepage = "https://github.com/nikita-volkov/stm-containers"; + description = "Containers for STM"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/stm-stats/default.nix b/pkgs/development/libraries/haskell/stm-stats/default.nix index e7f40a26320..4f58e73248c 100644 --- a/pkgs/development/libraries/haskell/stm-stats/default.nix +++ b/pkgs/development/libraries/haskell/stm-stats/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix index fe308211ebb..06d4bb20915 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.1.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.1.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix index 492fb6e3557..c1569687888 100644 --- a/pkgs/development/libraries/haskell/stm/2.1.2.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.1.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix index fc33a979adf..e3a1893ba15 100644 --- a/pkgs/development/libraries/haskell/stm/2.2.0.1.nix +++ b/pkgs/development/libraries/haskell/stm/2.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.3.nix b/pkgs/development/libraries/haskell/stm/2.3.nix index 4057b1f7fb3..bfa9b7dcb6f 100644 --- a/pkgs/development/libraries/haskell/stm/2.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.4.2.nix b/pkgs/development/libraries/haskell/stm/2.4.2.nix index a3fa76e4a51..7fc8b440935 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.2.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.4.3.nix b/pkgs/development/libraries/haskell/stm/2.4.3.nix index 28c3da5cba2..028ab054597 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.3.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stm/2.4.nix b/pkgs/development/libraries/haskell/stm/2.4.nix index a949474cef1..91fdea09202 100644 --- a/pkgs/development/libraries/haskell/stm/2.4.nix +++ b/pkgs/development/libraries/haskell/stm/2.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/storable-complex/default.nix b/pkgs/development/libraries/haskell/storable-complex/default.nix index 4450308a910..84073b8e223 100644 --- a/pkgs/development/libraries/haskell/storable-complex/default.nix +++ b/pkgs/development/libraries/haskell/storable-complex/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/storable-record/default.nix b/pkgs/development/libraries/haskell/storable-record/default.nix index 787956be46d..f818545d2f8 100644 --- a/pkgs/development/libraries/haskell/storable-record/default.nix +++ b/pkgs/development/libraries/haskell/storable-record/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers, utilityHt }: cabal.mkDerivation (self: { pname = "storable-record"; - version = "0.0.2.5"; - sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3"; + version = "0.0.3"; + sha256 = "1mv2s4r7dqkl2fy0wjnywyr2zi2g53nkn0z72mgr8drkzdszzxx1"; isLibrary = true; isExecutable = true; buildDepends = [ transformers utilityHt ]; diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index 1a17cd5f14f..4e681159391 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -1,13 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, blazeBuilder, deepseq, hspec, network, QuickCheck -, random, text, transformers, zlib +, random, stm, text, transformers, zlib }: cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.3"; - sha256 = "0zv309lqmv5bgbmxx5k0zk4iyxwj77lwqcaaycizi7559nzvsrh3"; + version = "0.1.4.1"; + sha256 = "0n5xm2j5hz0hbify0yanhcrkc3pni9s2c53h22alc7pcaimdmalc"; buildDepends = [ - blazeBuilder network random text transformers zlib + blazeBuilder network random stm text transformers zlib ]; testDepends = [ async blazeBuilder deepseq hspec network QuickCheck text zlib diff --git a/pkgs/development/libraries/haskell/streamproc/default.nix b/pkgs/development/libraries/haskell/streamproc/default.nix index 2b37be487e6..b1e03c38250 100644 --- a/pkgs/development/libraries/haskell/streamproc/default.nix +++ b/pkgs/development/libraries/haskell/streamproc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/strict/default.nix b/pkgs/development/libraries/haskell/strict/default.nix index 61b34efbe45..c7d9e7c154b 100644 --- a/pkgs/development/libraries/haskell/strict/default.nix +++ b/pkgs/development/libraries/haskell/strict/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/strictConcurrency/default.nix b/pkgs/development/libraries/haskell/strictConcurrency/default.nix index 915fad7006a..ec6791e1dda 100644 --- a/pkgs/development/libraries/haskell/strictConcurrency/default.nix +++ b/pkgs/development/libraries/haskell/strictConcurrency/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/string-combinators/default.nix b/pkgs/development/libraries/haskell/string-combinators/default.nix index bfc38fb07e8..cbc40aec564 100644 --- a/pkgs/development/libraries/haskell/string-combinators/default.nix +++ b/pkgs/development/libraries/haskell/string-combinators/default.nix @@ -1,10 +1,11 @@ -{ cabal, baseUnicodeSymbols }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: cabal.mkDerivation (self: { pname = "string-combinators"; - version = "0.6.0.4"; - sha256 = "0r1za5ypx9fz073h1yljjdkxmz0h77vg94bk827ndwkfgzgpzvh7"; - buildDepends = [ baseUnicodeSymbols ]; + version = "0.6.0.5"; + sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl"; meta = { homepage = "https://github.com/basvandijk/string-combinators"; description = "Polymorphic functions to build and combine stringlike values"; diff --git a/pkgs/development/libraries/haskell/string-conversions/default.nix b/pkgs/development/libraries/haskell/string-conversions/default.nix index efab2ee40bb..5176cad03cd 100644 --- a/pkgs/development/libraries/haskell/string-conversions/default.nix +++ b/pkgs/development/libraries/haskell/string-conversions/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/string-qq/default.nix b/pkgs/development/libraries/haskell/string-qq/default.nix index 78fe1c3930f..ac0e12811e0 100644 --- a/pkgs/development/libraries/haskell/string-qq/default.nix +++ b/pkgs/development/libraries/haskell/string-qq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stringable/default.nix b/pkgs/development/libraries/haskell/stringable/default.nix index 8e955f10f19..f7de2335ad2 100644 --- a/pkgs/development/libraries/haskell/stringable/default.nix +++ b/pkgs/development/libraries/haskell/stringable/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stringbuilder/default.nix b/pkgs/development/libraries/haskell/stringbuilder/default.nix index efe0956afc0..e75bc82159f 100644 --- a/pkgs/development/libraries/haskell/stringbuilder/default.nix +++ b/pkgs/development/libraries/haskell/stringbuilder/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stringprep/default.nix b/pkgs/development/libraries/haskell/stringprep/default.nix index 3fbdf196d5e..28a5660b1e7 100644 --- a/pkgs/development/libraries/haskell/stringprep/default.nix +++ b/pkgs/development/libraries/haskell/stringprep/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, tasty, tastyQuickcheck, tastyTh, text, textIcu }: diff --git a/pkgs/development/libraries/haskell/stringsearch/default.nix b/pkgs/development/libraries/haskell/stringsearch/default.nix index 12f19c836f3..709030bb2e7 100644 --- a/pkgs/development/libraries/haskell/stringsearch/default.nix +++ b/pkgs/development/libraries/haskell/stringsearch/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stripe/default.nix b/pkgs/development/libraries/haskell/stripe/default.nix index 36a7f9d2d66..83846eef2a8 100644 --- a/pkgs/development/libraries/haskell/stripe/default.nix +++ b/pkgs/development/libraries/haskell/stripe/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, httpConduit, httpTypes, mtl, text, time , unorderedContainers, utf8String }: diff --git a/pkgs/development/libraries/haskell/strptime/default.nix b/pkgs/development/libraries/haskell/strptime/default.nix index c092f0c0d15..a5975aaddc6 100644 --- a/pkgs/development/libraries/haskell/strptime/default.nix +++ b/pkgs/development/libraries/haskell/strptime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index 31501e26a80..afa664a68f9 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, cmdargs, filepath, haskellSrcExts, HUnit, mtl , strict, syb, testFramework, testFrameworkHunit, yaml }: cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.10.0"; - sha256 = "12sba4bbc1qzicvavlbf4wqj7xs2pk0z3ha70xsvldszhyav9zj9"; + version = "0.5.10.1"; + sha256 = "1jd2dbi844cjs012gwr5idk1jmn860ff8hy1r1s6jndsm69awbba"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/svgcairo/default.nix b/pkgs/development/libraries/haskell/svgcairo/default.nix index 248987d0c3b..01c6e4d999f 100644 --- a/pkgs/development/libraries/haskell/svgcairo/default.nix +++ b/pkgs/development/libraries/haskell/svgcairo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, glib, gtk2hsBuildtools, libc, librsvg, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.3.nix b/pkgs/development/libraries/haskell/syb/0.3.3.nix index 7caf5908a2d..c51e561fa2e 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix index 7638ab3332f..61bebdb27f2 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.6.1.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.6.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.7.nix b/pkgs/development/libraries/haskell/syb/0.3.7.nix index 44a16e0bf5c..1b22446ea6c 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.7.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.7.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.3.nix b/pkgs/development/libraries/haskell/syb/0.3.nix index 4b999a94416..e24ec591a04 100644 --- a/pkgs/development/libraries/haskell/syb/0.3.nix +++ b/pkgs/development/libraries/haskell/syb/0.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.4.0.nix b/pkgs/development/libraries/haskell/syb/0.4.0.nix index 7408d0ac537..c6322d397a4 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.0.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/0.4.2.nix b/pkgs/development/libraries/haskell/syb/0.4.2.nix index fd67f63ced5..288cb0bc2f7 100644 --- a/pkgs/development/libraries/haskell/syb/0.4.2.nix +++ b/pkgs/development/libraries/haskell/syb/0.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix index 0cf40a87d41..9477ba0f6fc 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class-instances-text.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, sybWithClass, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syb/syb-with-class.nix b/pkgs/development/libraries/haskell/syb/syb-with-class.nix index 9d613601704..f97221f5150 100644 --- a/pkgs/development/libraries/haskell/syb/syb-with-class.nix +++ b/pkgs/development/libraries/haskell/syb/syb-with-class.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/symbol/default.nix b/pkgs/development/libraries/haskell/symbol/default.nix index e5564b758ad..7fd90f55d66 100644 --- a/pkgs/development/libraries/haskell/symbol/default.nix +++ b/pkgs/development/libraries/haskell/symbol/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syntactic/default.nix b/pkgs/development/libraries/haskell/syntactic/default.nix index 39fbeebd33c..a2a33e89e15 100644 --- a/pkgs/development/libraries/haskell/syntactic/default.nix +++ b/pkgs/development/libraries/haskell/syntactic/default.nix @@ -1,21 +1,22 @@ -{ cabal, constraints, dataHash, mtl, QuickCheck, tasty, tastyGolden -, tastyQuickcheck, tastyTh, transformers, treeView, tuple +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, constraints, dataHash, mtl, QuickCheck, safe, tagged +, tasty, tastyGolden, tastyQuickcheck, tastyTh, treeView , utf8String }: cabal.mkDerivation (self: { pname = "syntactic"; - version = "1.12.1"; - sha256 = "0p68jgfwzr9mvgrcjdj3235109nhpaichm5irj9m29076axrsb94"; - buildDepends = [ - constraints dataHash mtl transformers treeView tuple - ]; + version = "2.0"; + sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x"; + buildDepends = [ constraints dataHash mtl safe tagged treeView ]; testDepends = [ - mtl QuickCheck tasty tastyGolden tastyQuickcheck tastyTh utf8String + QuickCheck tagged tasty tastyGolden tastyQuickcheck tastyTh + utf8String ]; meta = { homepage = "https://github.com/emilaxelsson/syntactic"; - description = "Generic abstract syntax, and utilities for embedded languages"; + description = "Generic representation and manipulation of abstract syntax"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index bd0654f728a..ad66c0eb720 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, systemFilepath, temporary, text, time, transformers }: diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 6bc7805cef6..e064ebe7357 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, chell, chellQuickcheck, deepseq, QuickCheck, text }: cabal.mkDerivation (self: { @@ -6,6 +8,7 @@ cabal.mkDerivation (self: { sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2"; buildDepends = [ deepseq text ]; testDepends = [ chell chellQuickcheck QuickCheck text ]; + doCheck = false; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; diff --git a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix index b0ccd4b4d84..748a69a20a4 100644 --- a/pkgs/development/libraries/haskell/system-posix-redirect/default.nix +++ b/pkgs/development/libraries/haskell/system-posix-redirect/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix index 230dc5fd6d1..e9e01fb78fb 100644 --- a/pkgs/development/libraries/haskell/system-time-monotonic/default.nix +++ b/pkgs/development/libraries/haskell/system-time-monotonic/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/syz/default.nix b/pkgs/development/libraries/haskell/syz/default.nix index 67e6bc58436..e8c6075ffd2 100644 --- a/pkgs/development/libraries/haskell/syz/default.nix +++ b/pkgs/development/libraries/haskell/syz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tables/default.nix b/pkgs/development/libraries/haskell/tables/default.nix new file mode 100644 index 00000000000..53b178066eb --- /dev/null +++ b/pkgs/development/libraries/haskell/tables/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, cereal, comonad, deepseq, doctest, filepath +, hashable, lens, profunctors, safecopy, transformers +, transformersCompat, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "tables"; + version = "0.4.1"; + sha256 = "131c97lgni0b9pmkdfd5y0lwrb9yh9qyahknhrim8dzpkkfynk49"; + buildDepends = [ + binary cereal comonad deepseq hashable lens profunctors safecopy + transformers transformersCompat unorderedContainers + ]; + testDepends = [ + doctest filepath lens transformers unorderedContainers + ]; + meta = { + homepage = "http://github.com/ekmett/tables/"; + description = "In-memory storage with multiple keys using lenses and traversals"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tabular/default.nix b/pkgs/development/libraries/haskell/tabular/default.nix index 10f78671013..a2f4c9fe270 100644 --- a/pkgs/development/libraries/haskell/tabular/default.nix +++ b/pkgs/development/libraries/haskell/tabular/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, csv, html, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tagged/default.nix b/pkgs/development/libraries/haskell/tagged/default.nix index 48a963dc869..f0256e49f9b 100644 --- a/pkgs/development/libraries/haskell/tagged/default.nix +++ b/pkgs/development/libraries/haskell/tagged/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/taggy-lens/default.nix b/pkgs/development/libraries/haskell/taggy-lens/default.nix new file mode 100644 index 00000000000..fe8344ba73d --- /dev/null +++ b/pkgs/development/libraries/haskell/taggy-lens/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, hspec, lens, taggy, text, unorderedContainers }: + +cabal.mkDerivation (self: { + pname = "taggy-lens"; + version = "0.1.2"; + sha256 = "05m2c9q0rz4y0zz6n3dqf0hhzfvk0mp1692jxykg86c802d7pkib"; + buildDepends = [ lens taggy text unorderedContainers ]; + testDepends = [ + doctest hspec lens taggy text unorderedContainers + ]; + meta = { + homepage = "http://github.com/alpmestan/taggy-lens"; + description = "Lenses for the taggy html/xml parser"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/taggy/default.nix b/pkgs/development/libraries/haskell/taggy/default.nix new file mode 100644 index 00000000000..9ddde26cbcf --- /dev/null +++ b/pkgs/development/libraries/haskell/taggy/default.nix @@ -0,0 +1,26 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, blazeHtml, blazeMarkup, hspec, hspecAttoparsec +, text, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "taggy"; + version = "0.1.1"; + sha256 = "14m02hn5ikw6qv36xxw7j39fm07q2pbs0m504ij7lvaf5c3rngz5"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec blazeHtml blazeMarkup text unorderedContainers vector + ]; + testDepends = [ + attoparsec blazeHtml blazeMarkup hspec hspecAttoparsec text + unorderedContainers vector + ]; + meta = { + homepage = "http://github.com/alpmestan/taggy"; + description = "Efficient and simple HTML/XML parsing library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/tagshare/default.nix b/pkgs/development/libraries/haskell/tagshare/default.nix index be56d518121..dbd88393c34 100644 --- a/pkgs/development/libraries/haskell/tagshare/default.nix +++ b/pkgs/development/libraries/haskell/tagshare/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tagsoup/default.nix b/pkgs/development/libraries/haskell/tagsoup/default.nix index b51541d56f6..a235aa1dff6 100644 --- a/pkgs/development/libraries/haskell/tagsoup/default.nix +++ b/pkgs/development/libraries/haskell/tagsoup/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix index ecdcbb1b63c..ee721836245 100644 --- a/pkgs/development/libraries/haskell/tagstream-conduit/default.nix +++ b/pkgs/development/libraries/haskell/tagstream-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, caseInsensitive, conduit, conduitExtra , dataDefault, hspec, HUnit, QuickCheck, resourcet, text diff --git a/pkgs/development/libraries/haskell/tar/default.nix b/pkgs/development/libraries/haskell/tar/default.nix index 41ea62d8126..e863832ea08 100644 --- a/pkgs/development/libraries/haskell/tar/default.nix +++ b/pkgs/development/libraries/haskell/tar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix index 2551b642fb1..b892344dc7c 100644 --- a/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix +++ b/pkgs/development/libraries/haskell/tasty-ant-xml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, genericDeriving, mtl, reducers, stm, tagged, tasty , transformers, xml }: diff --git a/pkgs/development/libraries/haskell/tasty-golden/default.nix b/pkgs/development/libraries/haskell/tasty-golden/default.nix index d6d8f2d625d..ea81aa6bea5 100644 --- a/pkgs/development/libraries/haskell/tasty-golden/default.nix +++ b/pkgs/development/libraries/haskell/tasty-golden/default.nix @@ -1,14 +1,18 @@ -{ cabal, deepseq, filepath, mtl, optparseApplicative, tagged, tasty -, temporaryRc +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, deepseq, filepath, mtl, optparseApplicative, tagged +, tasty, tastyHunit, temporaryRc }: cabal.mkDerivation (self: { pname = "tasty-golden"; - version = "2.2.1.2"; - sha256 = "107c6i1abw6dsd3cx1bgiyk8dnih7i9x4bl4kw6dfnva2kjkp4d1"; + version = "2.2.2.4"; + sha256 = "096c4h306r4z7wq8nm94mwmdndm0mwd6hhiqf77iilpdndasrl1c"; buildDepends = [ - deepseq filepath mtl optparseApplicative tagged tasty temporaryRc + async deepseq filepath mtl optparseApplicative tagged tasty + temporaryRc ]; + testDepends = [ filepath tasty tastyHunit temporaryRc ]; meta = { homepage = "https://github.com/feuerbach/tasty-golden"; description = "Golden tests support for tasty"; diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 19678805900..aad94da7c5e 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index 44efd608002..2492f673441 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index d4eb45eaa08..8a5c1b5d799 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, tagged, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-rerun/default.nix b/pkgs/development/libraries/haskell/tasty-rerun/default.nix index 65d0c73473a..6893bccee42 100644 --- a/pkgs/development/libraries/haskell/tasty-rerun/default.nix +++ b/pkgs/development/libraries/haskell/tasty-rerun/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, optparseApplicative, reducers, split, stm, tagged , tasty, transformers }: diff --git a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix index 40a30a6d24f..5df9ad4ee41 100644 --- a/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-smallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, smallcheck, tagged, tasty }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix index b1b9c179dba..7c9bcbbce00 100644 --- a/pkgs/development/libraries/haskell/tasty-th/default.nix +++ b/pkgs/development/libraries/haskell/tasty-th/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, languageHaskellExtract, tasty }: cabal.mkDerivation (self: { pname = "tasty-th"; - version = "0.1.1"; - sha256 = "0ndwfz2gq0did6dfjilhdaxzya2qw9gckjkj090cp2rbkahywsga"; + version = "0.1.2"; + sha256 = "1x3kixv0hnb7icigz2kfq959pivdc4jaaalvdgn8dlyqzkvfjzx4"; buildDepends = [ languageHaskellExtract tasty ]; meta = { homepage = "http://github.com/bennofs/tasty-th"; diff --git a/pkgs/development/libraries/haskell/tasty/default.nix b/pkgs/development/libraries/haskell/tasty/default.nix index bb8e20e98e4..661bc739e90 100644 --- a/pkgs/development/libraries/haskell/tasty/default.nix +++ b/pkgs/development/libraries/haskell/tasty/default.nix @@ -1,13 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, deepseq, mtl, optparseApplicative -, regexTdfa, stm, tagged, unboundedDelays +, regexTdfaRc, stm, tagged, unboundedDelays }: cabal.mkDerivation (self: { pname = "tasty"; - version = "0.8.1.1"; - sha256 = "04vzq5gwyd5zb6lsf8nbr5dypgf07b4aq70i1jghkg12v8h529dr"; + version = "0.8.1.3"; + sha256 = "0hc030ms89w3cl1k3r8nrym3g7sg2n66ch2ljg6d7fwhrsgxnagf"; buildDepends = [ - ansiTerminal async deepseq mtl optparseApplicative regexTdfa stm + ansiTerminal async deepseq mtl optparseApplicative regexTdfaRc stm tagged unboundedDelays ]; meta = { diff --git a/pkgs/development/libraries/haskell/tcache-AWS/default.nix b/pkgs/development/libraries/haskell/tcache-AWS/default.nix new file mode 100644 index 00000000000..37d7fef05af --- /dev/null +++ b/pkgs/development/libraries/haskell/tcache-AWS/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aws, conduit, httpConduit, network, TCache, text }: + +cabal.mkDerivation (self: { + pname = "tcache-AWS"; + version = "0.0.1"; + sha256 = "18hi8jvc117pxjhpb891hqlsbi4wvmd6nr3vwnqqr7rcw2dsmnwv"; + buildDepends = [ aws conduit httpConduit network TCache text ]; + meta = { + description = "tcache using Amazon Web Services as default persistence mechanism"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tomberek ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/template-default/default.nix b/pkgs/development/libraries/haskell/template-default/default.nix index a450b09b551..3a7e3f05bdd 100644 --- a/pkgs/development/libraries/haskell/template-default/default.nix +++ b/pkgs/development/libraries/haskell/template-default/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault }: cabal.mkDerivation (self: { @@ -5,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.1"; sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd"; buildDepends = [ dataDefault ]; + jailbreak = true; meta = { homepage = "https://github.com/haskell-pkg-janitors/template-default"; description = "declaring Default instances just got even easier"; diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix new file mode 100644 index 00000000000..f51ae4f0a3d --- /dev/null +++ b/pkgs/development/libraries/haskell/template/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, text }: + +cabal.mkDerivation (self: { + pname = "template"; + version = "0.2.0.9"; + sha256 = "0i1xq6nj240gddbd8d5m42gzix16k81wqmirpy5a4fssnkpwjqnb"; + buildDepends = [ mtl text ]; + meta = { + description = "Simple string substitution"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/temporary-rc/default.nix b/pkgs/development/libraries/haskell/temporary-rc/default.nix index 2f8cc9fad84..62931e168af 100644 --- a/pkgs/development/libraries/haskell/temporary-rc/default.nix +++ b/pkgs/development/libraries/haskell/temporary-rc/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/temporary/default.nix b/pkgs/development/libraries/haskell/temporary/default.nix index 4db5446bce0..3845fe79198 100644 --- a/pkgs/development/libraries/haskell/temporary/default.nix +++ b/pkgs/development/libraries/haskell/temporary/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, exceptions, filepath, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix index 3691615d016..89cf249ecd4 100644 --- a/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix +++ b/pkgs/development/libraries/haskell/terminal-progress-bar/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, HUnit, stm, stmChans, testFramework , testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/terminal-size/default.nix b/pkgs/development/libraries/haskell/terminal-size/default.nix index d33bc7d4317..4387ceb423e 100644 --- a/pkgs/development/libraries/haskell/terminal-size/default.nix +++ b/pkgs/development/libraries/haskell/terminal-size/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix index f772de7c8a1..6f00bffc393 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix +++ b/pkgs/development/libraries/haskell/terminfo/0.3.2.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ncurses }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix b/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix index 2e8c76ae2e5..d806680420d 100644 --- a/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix +++ b/pkgs/development/libraries/haskell/terminfo/0.4.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ncurses }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix index 9efcff9a6d1..a62d4cf115d 100644 --- a/pkgs/development/libraries/haskell/test-framework-hunit/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-hunit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, HUnit, testFramework }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix index cabc0fe1d0a..a328edfab3e 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, extensibleExceptions, QuickCheck, random , testFramework }: diff --git a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix index a832664b28a..70c2e0c36c9 100644 --- a/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-quickcheck2/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, extensibleExceptions, QuickCheck, random, testFramework }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix index 120425e8c01..5837ea46741 100644 --- a/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-smallcheck/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, smallcheck, testFramework, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix index 43791413a7f..f53c68e5e7f 100644 --- a/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th-prime/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs, haskellSrcExts, testFramework }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/test-framework-th/default.nix b/pkgs/development/libraries/haskell/test-framework-th/default.nix index f70e522a2ce..a90c3117cd4 100644 --- a/pkgs/development/libraries/haskell/test-framework-th/default.nix +++ b/pkgs/development/libraries/haskell/test-framework-th/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcExts, languageHaskellExtract, regexPosix , testFramework }: diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index 735666734e3..4f204bb308d 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, ansiWlPprint, hostname, random, regexPosix , time, xml }: diff --git a/pkgs/development/libraries/haskell/testing-feat/default.nix b/pkgs/development/libraries/haskell/testing-feat/default.nix index c0e46360880..e45d49fb5a8 100644 --- a/pkgs/development/libraries/haskell/testing-feat/default.nix +++ b/pkgs/development/libraries/haskell/testing-feat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, QuickCheck, tagshare }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index 76963ae36c5..dac1add7cb9 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, pandocTypes, parsec, syb, xml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text-format/default.nix b/pkgs/development/libraries/haskell/text-format/default.nix index b478fb7c515..c1bc8c8bc8e 100644 --- a/pkgs/development/libraries/haskell/text-format/default.nix +++ b/pkgs/development/libraries/haskell/text-format/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doubleConversion, text, time, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text-icu/default.nix b/pkgs/development/libraries/haskell/text-icu/default.nix index 222475b24bb..4a7db1560ea 100644 --- a/pkgs/development/libraries/haskell/text-icu/default.nix +++ b/pkgs/development/libraries/haskell/text-icu/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, icu, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2, text }: diff --git a/pkgs/development/libraries/haskell/text-stream-decode/default.nix b/pkgs/development/libraries/haskell/text-stream-decode/default.nix index 0530804d84b..2f34dbb0b46 100644 --- a/pkgs/development/libraries/haskell/text-stream-decode/default.nix +++ b/pkgs/development/libraries/haskell/text-stream-decode/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, hspec, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.0.5.nix b/pkgs/development/libraries/haskell/text/0.11.0.5.nix index 59644d05720..fbd0b62607f 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.0.6.nix b/pkgs/development/libraries/haskell/text/0.11.0.6.nix index 04fd250dfe9..eab5417a0a6 100644 --- a/pkgs/development/libraries/haskell/text/0.11.0.6.nix +++ b/pkgs/development/libraries/haskell/text/0.11.0.6.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.1.5.nix b/pkgs/development/libraries/haskell/text/0.11.1.5.nix index 03c2d90ff8d..52a935faa72 100644 --- a/pkgs/development/libraries/haskell/text/0.11.1.5.nix +++ b/pkgs/development/libraries/haskell/text/0.11.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/text/0.11.2.0.nix b/pkgs/development/libraries/haskell/text/0.11.2.0.nix index ab784807bfa..8ab44a1372d 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.0.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/text/0.11.2.3.nix b/pkgs/development/libraries/haskell/text/0.11.2.3.nix index afa0e7eb5d3..ac7b4714fdc 100644 --- a/pkgs/development/libraries/haskell/text/0.11.2.3.nix +++ b/pkgs/development/libraries/haskell/text/0.11.2.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/text/0.11.3.1.nix b/pkgs/development/libraries/haskell/text/0.11.3.1.nix index 6bbab990b8a..67f322e6990 100644 --- a/pkgs/development/libraries/haskell/text/0.11.3.1.nix +++ b/pkgs/development/libraries/haskell/text/0.11.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/text/1.1.1.3.nix b/pkgs/development/libraries/haskell/text/1.1.1.3.nix index 0df511231c8..d130219667d 100644 --- a/pkgs/development/libraries/haskell/text/1.1.1.3.nix +++ b/pkgs/development/libraries/haskell/text/1.1.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, HUnit, QuickCheck, random, testFramework , testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/tf-random/default.nix b/pkgs/development/libraries/haskell/tf-random/default.nix index 79e27f87fc6..4b123bc3164 100644 --- a/pkgs/development/libraries/haskell/tf-random/default.nix +++ b/pkgs/development/libraries/haskell/tf-random/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, primitive, random, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-desugar/default.nix b/pkgs/development/libraries/haskell/th-desugar/default.nix index b8f47865424..50bea860af3 100644 --- a/pkgs/development/libraries/haskell/th-desugar/default.nix +++ b/pkgs/development/libraries/haskell/th-desugar/default.nix @@ -1,11 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, mtl, syb }: cabal.mkDerivation (self: { pname = "th-desugar"; - version = "1.4.0"; - sha256 = "0jadwqhk9dqnicg3p958a6cyfvl70amjc1hl7bhlygpxpdfffwad"; + version = "1.4.2"; + sha256 = "16l0khjx2wppnm9spp6mg659m95hxjkzfv3pjw5ays3z6clhx8b9"; buildDepends = [ mtl syb ]; testDepends = [ hspec HUnit mtl syb ]; + doCheck = false; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; description = "Functions to desugar Template Haskell"; diff --git a/pkgs/development/libraries/haskell/th-expand-syns/default.nix b/pkgs/development/libraries/haskell/th-expand-syns/default.nix index 9874fc6e13a..5cb842ab388 100644 --- a/pkgs/development/libraries/haskell/th-expand-syns/default.nix +++ b/pkgs/development/libraries/haskell/th-expand-syns/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-extras/default.nix b/pkgs/development/libraries/haskell/th-extras/default.nix index 3475ccb804a..2bc598005f4 100644 --- a/pkgs/development/libraries/haskell/th-extras/default.nix +++ b/pkgs/development/libraries/haskell/th-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix index 32354eabd4a..0ecd9d70989 100644 --- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, filepath, QuickCheck, text, thLift, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index 04c8b0bd51a..9ca43633ead 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/th-orphans/default.nix b/pkgs/development/libraries/haskell/th-orphans/default.nix index 9a8d22423a3..d93be541aee 100644 --- a/pkgs/development/libraries/haskell/th-orphans/default.nix +++ b/pkgs/development/libraries/haskell/th-orphans/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, thLift }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/these/default.nix b/pkgs/development/libraries/haskell/these/default.nix index f41f8a4f302..7b989c7ad38 100644 --- a/pkgs/development/libraries/haskell/these/default.nix +++ b/pkgs/development/libraries/haskell/these/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bifunctors, mtl, profunctors, semigroupoids, semigroups , transformers, vector }: diff --git a/pkgs/development/libraries/haskell/thespian/default.nix b/pkgs/development/libraries/haskell/thespian/default.nix index aa848e4aa08..22861c4a908 100644 --- a/pkgs/development/libraries/haskell/thespian/default.nix +++ b/pkgs/development/libraries/haskell/thespian/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/threadmanager/default.nix b/pkgs/development/libraries/haskell/threadmanager/default.nix index e4a82835c55..320b750cb33 100644 --- a/pkgs/development/libraries/haskell/threadmanager/default.nix +++ b/pkgs/development/libraries/haskell/threadmanager/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/threads/default.nix b/pkgs/development/libraries/haskell/threads/default.nix index 48b4ee2fb11..96b6fbb172a 100644 --- a/pkgs/development/libraries/haskell/threads/default.nix +++ b/pkgs/development/libraries/haskell/threads/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, baseUnicodeSymbols, concurrentExtra, HUnit, stm , testFramework, testFrameworkHunit }: diff --git a/pkgs/development/libraries/haskell/threepenny-gui/default.nix b/pkgs/development/libraries/haskell/threepenny-gui/default.nix index ea655ab91c1..d31c43538d3 100644 --- a/pkgs/development/libraries/haskell/threepenny-gui/default.nix +++ b/pkgs/development/libraries/haskell/threepenny-gui/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsecEnumerator, dataDefault, deepseq , filepath, hashable, MonadCatchIOTransformers, network, safe , snapCore, snapServer, stm, text, time, transformers diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index c127116ffca..dbf78bac903 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -1,12 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, Cabal, deepseq, filepath, mtl , profunctors, QuickCheck, random, systemPosixRedirect, text, time -, vector, vectorSpace, vectorThUnbox +, vector, vectorSpace, vectorThUnbox, cpphs }: cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.1"; - sha256 = "0v3aq7zv4fnkjhfc7mm6vx2wb5dh2npf2lsgpvcrdpy5zlfsrx50"; + version = "0.3.5.2"; + sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; + buildTools = [ cpphs ]; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/time-compat/default.nix b/pkgs/development/libraries/haskell/time-compat/default.nix index fa7c3ff4185..ed9da18c39a 100644 --- a/pkgs/development/libraries/haskell/time-compat/default.nix +++ b/pkgs/development/libraries/haskell/time-compat/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/time-recurrence/default.nix b/pkgs/development/libraries/haskell/time-recurrence/default.nix index 0e23f84ebfc..8f0aa711151 100644 --- a/pkgs/development/libraries/haskell/time-recurrence/default.nix +++ b/pkgs/development/libraries/haskell/time-recurrence/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataOrdlist, HUnit, mtl, testFramework, testFrameworkHunit , time }: diff --git a/pkgs/development/libraries/haskell/time/1.1.2.4.nix b/pkgs/development/libraries/haskell/time/1.1.2.4.nix index 56072676b67..b2fffb39cd3 100644 --- a/pkgs/development/libraries/haskell/time/1.1.2.4.nix +++ b/pkgs/development/libraries/haskell/time/1.1.2.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/time/1.4.2.nix b/pkgs/development/libraries/haskell/time/1.4.2.nix index ff9818a387d..ba986cf76ab 100644 --- a/pkgs/development/libraries/haskell/time/1.4.2.nix +++ b/pkgs/development/libraries/haskell/time/1.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, QuickCheck, testFramework , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/timeparsers/default.nix b/pkgs/development/libraries/haskell/timeparsers/default.nix index 4920c0b3adb..3259d706a68 100644 --- a/pkgs/development/libraries/haskell/timeparsers/default.nix +++ b/pkgs/development/libraries/haskell/timeparsers/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, convertible, mtl, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/timerep/default.nix b/pkgs/development/libraries/haskell/timerep/default.nix index 24bd1c017aa..aea0fe91208 100644 --- a/pkgs/development/libraries/haskell/timerep/default.nix +++ b/pkgs/development/libraries/haskell/timerep/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index 6a0e81383f7..cfd4c7fa7f5 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, extensibleExceptions, time, timezoneSeries }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix index cb7e40243ff..2092c176de7 100644 --- a/pkgs/development/libraries/haskell/timezone-series/default.nix +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix index 0fdcaf71d51..0d5c97433b2 100644 --- a/pkgs/development/libraries/haskell/tls-extra/default.nix +++ b/pkgs/development/libraries/haskell/tls-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, certificate, cipherAes, cipherRc4, cryptohash , cryptoPubkey, cryptoRandom, mtl, network, pem, time, tls, vector }: diff --git a/pkgs/development/libraries/haskell/tls/1.1.5.nix b/pkgs/development/libraries/haskell/tls/1.1.5.nix index 0f354d8b77e..747f2edfc43 100644 --- a/pkgs/development/libraries/haskell/tls/1.1.5.nix +++ b/pkgs/development/libraries/haskell/tls/1.1.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, certificate, cprngAes, cryptohash, cryptoPubkey , cryptoRandom, mtl, network, QuickCheck, testFramework , testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/tls/1.2.8.nix b/pkgs/development/libraries/haskell/tls/1.2.8.nix index 8bba66b6c92..5c1098be62f 100644 --- a/pkgs/development/libraries/haskell/tls/1.2.8.nix +++ b/pkgs/development/libraries/haskell/tls/1.2.8.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes , cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash , cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom diff --git a/pkgs/development/libraries/haskell/tostring/default.nix b/pkgs/development/libraries/haskell/tostring/default.nix new file mode 100644 index 00000000000..eee617ffd2b --- /dev/null +++ b/pkgs/development/libraries/haskell/tostring/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, text, utf8String }: + +cabal.mkDerivation (self: { + pname = "tostring"; + version = "0.2.0.1"; + sha256 = "1gihls2xslr9fzad2659zv8af9k4cm84888nhx3z9bwasviyg448"; + buildDepends = [ text utf8String ]; + meta = { + description = "The ToString class"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/transformers-base/default.nix b/pkgs/development/libraries/haskell/transformers-base/default.nix index ea48a566dc0..ec3f740b66e 100644 --- a/pkgs/development/libraries/haskell/transformers-base/default.nix +++ b/pkgs/development/libraries/haskell/transformers-base/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix index 4647bbe2980..6ee2a6a25af 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix index dfe9e2ef0d6..b16522891c0 100644 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers-free/default.nix b/pkgs/development/libraries/haskell/transformers-free/default.nix index da05e122e52..929b41fdefe 100644 --- a/pkgs/development/libraries/haskell/transformers-free/default.nix +++ b/pkgs/development/libraries/haskell/transformers-free/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix index 6d2e374687f..941de0d077d 100644 --- a/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.2.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix index ec1b85248d9..8c994468dba 100644 --- a/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.3.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix index dd3789e5802..85fee8ad79f 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix index 12a6f393bc6..f36be260c55 100644 --- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix +++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tree-view/default.nix b/pkgs/development/libraries/haskell/tree-view/default.nix index 7ceefb815d8..6c3adfdb9f4 100644 --- a/pkgs/development/libraries/haskell/tree-view/default.nix +++ b/pkgs/development/libraries/haskell/tree-view/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/trifecta/default.nix b/pkgs/development/libraries/haskell/trifecta/default.nix index 09f3b112c1b..4710189f913 100644 --- a/pkgs/development/libraries/haskell/trifecta/default.nix +++ b/pkgs/development/libraries/haskell/trifecta/default.nix @@ -1,19 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, ansiWlPprint, blazeBuilder, blazeHtml , blazeMarkup, charset, comonad, deepseq, doctest, filepath -, fingertree, hashable, lens, mtl, parsers, reducers, semigroups -, transformers, unorderedContainers, utf8String +, fingertree, hashable, lens, mtl, parsers, QuickCheck, reducers +, semigroups, transformers, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "trifecta"; - version = "1.4.2"; - sha256 = "13kj1xz2bxixsqsrywdx3snl1hjkyv437ifwfrys1m4hnkv4aqai"; + version = "1.4.3"; + sha256 = "0kc8ykvh8m9yhyrkd9kx5xkv5ag99384k06xdi6ynjqv9wj6gfzg"; buildDepends = [ ansiTerminal ansiWlPprint blazeBuilder blazeHtml blazeMarkup charset comonad deepseq fingertree hashable lens mtl parsers reducers semigroups transformers unorderedContainers utf8String ]; - testDepends = [ doctest filepath ]; + testDepends = [ doctest filepath parsers QuickCheck ]; meta = { homepage = "http://github.com/ekmett/trifecta/"; description = "A modern parser combinator library with convenient diagnostics"; diff --git a/pkgs/development/libraries/haskell/tuple/default.nix b/pkgs/development/libraries/haskell/tuple/default.nix index 90441f31867..332e38305e7 100644 --- a/pkgs/development/libraries/haskell/tuple/default.nix +++ b/pkgs/development/libraries/haskell/tuple/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, OneTuple }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 4d14ed4582a..11ca4f491a8 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -1,23 +1,30 @@ -{ cabal, aeson, attoparsec, attoparsecConduit, authenticateOauth -, conduit, dataDefault, doctest, failure, filepath, hlint -, httpClient, httpConduit, httpTypes, lens, liftedBase -, monadControl, monadLogger, resourcet, shakespeare, text, time +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, authenticateOauth, caseInsensitive +, conduit, conduitExtra, dataDefault, doctest, filepath, hlint +, hspec, httpClient, httpConduit, httpTypes, lens, monadControl +, monadLogger, network, resourcet, shakespeare, text, time , transformers, transformersBase, twitterTypes }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.2.1"; - sha256 = "1z0d8hwjrdw8gkww9zkn9cqv3g40my952li8pm3c164d7ywswszq"; + version = "0.0.5.2"; + sha256 = "0kcdf440fy998qy232mg8k9i97lwvgwzzv990a07m4hj771pp3fh"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec attoparsecConduit authenticateOauth conduit - dataDefault failure httpClient httpConduit httpTypes lens - liftedBase monadControl monadLogger resourcet shakespeare text time - transformers transformersBase twitterTypes + aeson attoparsec authenticateOauth conduit conduitExtra dataDefault + httpClient httpConduit httpTypes lens monadLogger resourcet + shakespeare text time transformers twitterTypes + ]; + testDepends = [ + aeson attoparsec authenticateOauth caseInsensitive conduit + conduitExtra dataDefault doctest filepath hlint hspec httpClient + httpConduit httpTypes lens monadControl monadLogger network + resourcet shakespeare text time transformers transformersBase + twitterTypes ]; - testDepends = [ doctest filepath hlint ]; meta = { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 4b73fc5cf5a..f87230271f1 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, httpTypes, HUnit, shakespeare , testFramework, testFrameworkHunit, testFrameworkThPrime, text , unorderedContainers @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.3.20140601"; - sha256 = "1z8vdhyklgb4s3jxkavb8n62h9cn3y80qqzab3hswfv5xwri20ni"; + version = "0.3.20140620"; + sha256 = "02mwdgz1l1z5k5k78bjnnbabcr27xixli1gqk6rmqrarcylybvll"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ aeson attoparsec httpTypes HUnit shakespeare testFramework diff --git a/pkgs/development/libraries/haskell/type-eq/default.nix b/pkgs/development/libraries/haskell/type-eq/default.nix index 55bc6b03a95..0a5de6fa9fc 100644 --- a/pkgs/development/libraries/haskell/type-eq/default.nix +++ b/pkgs/development/libraries/haskell/type-eq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cpphs }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index ee90387b637..2bcdc0e5897 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix index 62690186ee8..7bc0c31b86d 100644 --- a/pkgs/development/libraries/haskell/type-level-natural-number/default.nix +++ b/pkgs/development/libraries/haskell/type-level-natural-number/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix index 95cd928a99e..3de1fafd582 100644 --- a/pkgs/development/libraries/haskell/tz/default.nix +++ b/pkgs/development/libraries/haskell/tz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, bindingsPosix, deepseq, HUnit, pkgs_tzdata , QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, time, tzdata, vector @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "tz"; - version = "0.0.0.5"; - sha256 = "03s5vs08dj3r7rq78ncya6x6dazvr93gfylyynwybpai09l2y89v"; + version = "0.0.0.6"; + sha256 = "0yn2c016fzqwbgdrqp5hjn95gzp4w3gqjgax1w6wkg97bksdlq27"; buildDepends = [ binary deepseq time tzdata vector ]; testDepends = [ bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/tzdata/default.nix b/pkgs/development/libraries/haskell/tzdata/default.nix index 10d4f87141d..b149a59489a 100644 --- a/pkgs/development/libraries/haskell/tzdata/default.nix +++ b/pkgs/development/libraries/haskell/tzdata/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filemanip, filepath, HUnit, MissingH, testFramework , testFrameworkHunit, testFrameworkTh, vector }: diff --git a/pkgs/development/libraries/haskell/unbound/default.nix b/pkgs/development/libraries/haskell/unbound/default.nix index 761246b396c..e8fc81254d1 100644 --- a/pkgs/development/libraries/haskell/unbound/default.nix +++ b/pkgs/development/libraries/haskell/unbound/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, mtl, RepLib, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unbounded-delays/default.nix b/pkgs/development/libraries/haskell/unbounded-delays/default.nix index 78484a2a75a..af3dd417a99 100644 --- a/pkgs/development/libraries/haskell/unbounded-delays/default.nix +++ b/pkgs/development/libraries/haskell/unbounded-delays/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix index b50713d5291..f17b08b3ab6 100644 --- a/pkgs/development/libraries/haskell/union-find/default.nix +++ b/pkgs/development/libraries/haskell/union-find/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uniplate/default.nix b/pkgs/development/libraries/haskell/uniplate/default.nix index ab9471bc3f2..17ab561e71d 100644 --- a/pkgs/development/libraries/haskell/uniplate/default.nix +++ b/pkgs/development/libraries/haskell/uniplate/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, syb, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uniqueid/default.nix b/pkgs/development/libraries/haskell/uniqueid/default.nix index 399ac02e3ce..076601b1f85 100644 --- a/pkgs/development/libraries/haskell/uniqueid/default.nix +++ b/pkgs/development/libraries/haskell/uniqueid/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix index a386257eaee..c5d5262750d 100644 --- a/pkgs/development/libraries/haskell/units/default.nix +++ b/pkgs/development/libraries/haskell/units/default.nix @@ -1,10 +1,20 @@ -{ cabal, singletons }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnitApprox, mtl, multimap, parsec, singletons, syb, tasty +, tastyHunit, thDesugar, vectorSpace +}: cabal.mkDerivation (self: { pname = "units"; - version = "2.0"; - sha256 = "1iv0pirhyp7crbkb008k14z57jl8c91r1sl8kqmb778xawb1hx52"; - buildDepends = [ singletons ]; + version = "2.1"; + sha256 = "1qrjc57j15ras0v43cpd7qhh9nzh9dbnkaik6s4c8aj8nkhgd8vs"; + buildDepends = [ + mtl multimap parsec singletons syb thDesugar vectorSpace + ]; + testDepends = [ + HUnitApprox mtl multimap parsec singletons syb tasty tastyHunit + thDesugar vectorSpace + ]; meta = { homepage = "http://www.cis.upenn.edu/~eir/packages/units"; description = "A domain-specific type system for dimensional analysis"; diff --git a/pkgs/development/libraries/haskell/unix-bytestring/default.nix b/pkgs/development/libraries/haskell/unix-bytestring/default.nix index 484ab6148a2..4219611f910 100644 --- a/pkgs/development/libraries/haskell/unix-bytestring/default.nix +++ b/pkgs/development/libraries/haskell/unix-bytestring/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix index 9742b193e7b..8d1657b7f1a 100644 --- a/pkgs/development/libraries/haskell/unix-compat/default.nix +++ b/pkgs/development/libraries/haskell/unix-compat/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "unix-compat"; - version = "0.4.1.1"; - sha256 = "1cjny6zca5wdj7d56kjkaxlad85kknn91pisrizjy6wngszyaigf"; + version = "0.4.1.3"; + sha256 = "1vfw3ffzdk9mshhgyp3dnbn8rihkz8qg6n5zqak8966dsdqhm4xb"; meta = { homepage = "http://github.com/jystic/unix-compat"; description = "Portable POSIX-compatibility layer"; diff --git a/pkgs/development/libraries/haskell/unix-memory/default.nix b/pkgs/development/libraries/haskell/unix-memory/default.nix index d4c65ff0475..caaf6c1bde5 100644 --- a/pkgs/development/libraries/haskell/unix-memory/default.nix +++ b/pkgs/development/libraries/haskell/unix-memory/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, mtl, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix index 73343bf307b..ff2104ff439 100644 --- a/pkgs/development/libraries/haskell/unix-process-conduit/default.nix +++ b/pkgs/development/libraries/haskell/unix-process-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit, filepath, hspec, stm, time, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/unix-time/default.nix b/pkgs/development/libraries/haskell/unix-time/default.nix index e329c1ef406..1fc8fd24e25 100644 --- a/pkgs/development/libraries/haskell/unix-time/default.nix +++ b/pkgs/development/libraries/haskell/unix-time/default.nix @@ -1,11 +1,13 @@ -{ cabal, doctest, hspec, QuickCheck, time }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, doctest, hspec, QuickCheck, time }: cabal.mkDerivation (self: { pname = "unix-time"; - version = "0.2.2"; - sha256 = "0xnl12mscc5nwjl9s2lx4xr8q8agzcpxh3bmxxidfjrg19drfwrm"; + version = "0.3.2"; + sha256 = "0bbzrm4hprqsljwscpfmnw3ipj809q7570alzn1qampijsbb4cds"; + buildDepends = [ binary ]; testDepends = [ doctest hspec QuickCheck time ]; - configureFlags = self.stdenv.lib.optionalString self.enableSharedLibraries "--ghc-option=-fPIC"; meta = { description = "Unix time parser/formatter and utilities"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/unlambda/default.nix b/pkgs/development/libraries/haskell/unlambda/default.nix index 474bb1a8b09..ea4c0f8cd63 100644 --- a/pkgs/development/libraries/haskell/unlambda/default.nix +++ b/pkgs/development/libraries/haskell/unlambda/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl }: cabal.mkDerivation (self: { @@ -7,6 +9,7 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ mtl ]; + hyperlinkSource = false; meta = { description = "Unlambda interpreter"; license = "GPL"; diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix index a8f1ae922ee..ccbf8c25e2d 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.3.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix index 80d4686fef3..228e11ded3e 100644 --- a/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: diff --git a/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix new file mode 100644 index 00000000000..70f00b68d42 --- /dev/null +++ b/pkgs/development/libraries/haskell/unordered-containers/0.2.5.0.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, ChasingBottoms, deepseq, hashable, HUnit, QuickCheck +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "unordered-containers"; + version = "0.2.5.0"; + sha256 = "0y85a9zg77h05c5ajchvfazg84ksvyi92r6bbmh09qzlf7mlb4bj"; + buildDepends = [ deepseq hashable ]; + testDepends = [ + ChasingBottoms hashable HUnit QuickCheck testFramework + testFrameworkHunit testFrameworkQuickcheck2 + ]; + doCheck = false; + meta = { + homepage = "https://github.com/tibbe/unordered-containers"; + description = "Efficient hashing-based container types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uri-encode/default.nix b/pkgs/development/libraries/haskell/uri-encode/default.nix new file mode 100644 index 00000000000..3a2d786cd8f --- /dev/null +++ b/pkgs/development/libraries/haskell/uri-encode/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, network, text, utf8String }: + +cabal.mkDerivation (self: { + pname = "uri-encode"; + version = "1.5.0.2"; + sha256 = "1lsj9y3sw9wlpsw7j20frvv9a165mcqx7x7vrp2gamka1120pkym"; + isLibrary = true; + isExecutable = true; + buildDepends = [ network text utf8String ]; + meta = { + description = "Unicode aware uri-encoding"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/uri/default.nix b/pkgs/development/libraries/haskell/uri/default.nix index aa94c931e54..11276f2bc4a 100644 --- a/pkgs/development/libraries/haskell/uri/default.nix +++ b/pkgs/development/libraries/haskell/uri/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, parsec, safe, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/url/default.nix b/pkgs/development/libraries/haskell/url/default.nix index 5353895815d..c71e39768ac 100644 --- a/pkgs/development/libraries/haskell/url/default.nix +++ b/pkgs/development/libraries/haskell/url/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/urlencoded/default.nix b/pkgs/development/libraries/haskell/urlencoded/default.nix index 05bd2ab09bb..74ae443f8a6 100644 --- a/pkgs/development/libraries/haskell/urlencoded/default.nix +++ b/pkgs/development/libraries/haskell/urlencoded/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, split }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/usb/default.nix b/pkgs/development/libraries/haskell/usb/default.nix index a023a682a92..5f57d42a2b6 100644 --- a/pkgs/development/libraries/haskell/usb/default.nix +++ b/pkgs/development/libraries/haskell/usb/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bindingsLibusb, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/utf8-light/default.nix b/pkgs/development/libraries/haskell/utf8-light/default.nix index 1c2e1f5c116..85c87a67023 100644 --- a/pkgs/development/libraries/haskell/utf8-light/default.nix +++ b/pkgs/development/libraries/haskell/utf8-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/utf8-string/default.nix b/pkgs/development/libraries/haskell/utf8-string/default.nix index 1233ce8806d..405dbecb6ba 100644 --- a/pkgs/development/libraries/haskell/utf8-string/default.nix +++ b/pkgs/development/libraries/haskell/utf8-string/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/utility-ht/default.nix b/pkgs/development/libraries/haskell/utility-ht/default.nix index 3a407cc4b59..ee5e8de92b1 100644 --- a/pkgs/development/libraries/haskell/utility-ht/default.nix +++ b/pkgs/development/libraries/haskell/utility-ht/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uu-interleaved/default.nix b/pkgs/development/libraries/haskell/uu-interleaved/default.nix index a71111282fa..63873ab18c5 100644 --- a/pkgs/development/libraries/haskell/uu-interleaved/default.nix +++ b/pkgs/development/libraries/haskell/uu-interleaved/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uu-options/default.nix b/pkgs/development/libraries/haskell/uu-options/default.nix index 651cd9fe450..e20058de46d 100644 --- a/pkgs/development/libraries/haskell/uu-options/default.nix +++ b/pkgs/development/libraries/haskell/uu-options/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lenses, mtl, transformers, uuInterleaved, uuParsinglib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix index 2a115b8b217..9b601102d8a 100644 --- a/pkgs/development/libraries/haskell/uu-parsinglib/default.nix +++ b/pkgs/development/libraries/haskell/uu-parsinglib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ListLike, time, uuInterleaved }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index a38a108bc03..eb36f5555ae 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cryptohash, deepseq, hashable, HUnit, networkInfo , QuickCheck, random, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 0f7ec86e246..ed92081d6cc 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix index 5ab1d4f8546..b3579d34158 100644 --- a/pkgs/development/libraries/haskell/vacuum-cairo/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-cairo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, deepseq, gtk, strictConcurrency, svgcairo, vacuum }: diff --git a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix index 2db9e3c83c1..9c719605537 100644 --- a/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix +++ b/pkgs/development/libraries/haskell/vacuum-graphviz/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, graphviz, vacuum }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vacuum/default.nix b/pkgs/development/libraries/haskell/vacuum/default.nix index fa37f089348..d9df682143f 100644 --- a/pkgs/development/libraries/haskell/vacuum/default.nix +++ b/pkgs/development/libraries/haskell/vacuum/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ghcPaths }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vado/default.nix b/pkgs/development/libraries/haskell/vado/default.nix index 45e9524657a..6c686093502 100644 --- a/pkgs/development/libraries/haskell/vado/default.nix +++ b/pkgs/development/libraries/haskell/vado/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, filepath, QuickCheck, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vault/default.nix b/pkgs/development/libraries/haskell/vault/default.nix index 8786838ab3d..4fad4a00363 100644 --- a/pkgs/development/libraries/haskell/vault/default.nix +++ b/pkgs/development/libraries/haskell/vault/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, unorderedContainers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vcs-revision/default.nix b/pkgs/development/libraries/haskell/vcs-revision/default.nix index 64402ea8464..804ee0191f3 100644 --- a/pkgs/development/libraries/haskell/vcs-revision/default.nix +++ b/pkgs/development/libraries/haskell/vcs-revision/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index b639527520b..0a8d8a4caad 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, gtk3, mtl, vcswrapper }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index d23620d9d68..75336ef8816 100644 --- a/pkgs/development/libraries/haskell/vcswrapper/default.nix +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hxt, mtl, parsec, split, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vect/default.nix b/pkgs/development/libraries/haskell/vect/default.nix index 2d81a013176..00ee6dacb9e 100644 --- a/pkgs/development/libraries/haskell/vect/default.nix +++ b/pkgs/development/libraries/haskell/vect/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-algorithms/default.nix b/pkgs/development/libraries/haskell/vector-algorithms/default.nix index 74b098a3a7f..00258e7f3f6 100644 --- a/pkgs/development/libraries/haskell/vector-algorithms/default.nix +++ b/pkgs/development/libraries/haskell/vector-algorithms/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, mwcRandom, primitive, QuickCheck, vector }: cabal.mkDerivation (self: { pname = "vector-algorithms"; - version = "0.6.0.1"; - sha256 = "0dkiz0c5dmc3a15zz5pxv4rz4n0bw5irb5a148gccfrg5c80vzc5"; + version = "0.6.0.2"; + sha256 = "1gn2pvgvm9g0dajx2wv305fxwhkpdj9pybrwrm3j2frl4dnj7dcq"; isLibrary = true; isExecutable = true; buildDepends = [ mtl mwcRandom primitive vector ]; diff --git a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix index 62d1c0506ed..1ef75f14a77 100644 --- a/pkgs/development/libraries/haskell/vector-binary-instances/default.nix +++ b/pkgs/development/libraries/haskell/vector-binary-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cereal, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-instances/default.nix b/pkgs/development/libraries/haskell/vector-instances/default.nix index c6ff62f86cd..c39dc6c371b 100644 --- a/pkgs/development/libraries/haskell/vector-instances/default.nix +++ b/pkgs/development/libraries/haskell/vector-instances/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, comonad, keys, pointed, semigroupoids, semigroups, vector }: diff --git a/pkgs/development/libraries/haskell/vector-space-points/default.nix b/pkgs/development/libraries/haskell/vector-space-points/default.nix index ca9218bf42c..e7eb15d6556 100644 --- a/pkgs/development/libraries/haskell/vector-space-points/default.nix +++ b/pkgs/development/libraries/haskell/vector-space-points/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, vectorSpace }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector-space/default.nix b/pkgs/development/libraries/haskell/vector-space/default.nix index c6d440a5d47..5eb4ed5ff2a 100644 --- a/pkgs/development/libraries/haskell/vector-space/default.nix +++ b/pkgs/development/libraries/haskell/vector-space/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Boolean, MemoTrie, NumInstances }: cabal.mkDerivation (self: { pname = "vector-space"; - version = "0.8.6"; - sha256 = "03kz2qhnynbgs4vk7348zjkkakzzwvxhbasl0lcazj1cx1ay7c4l"; + version = "0.8.7"; + sha256 = "1i3c34b3ngksmw4blhldap8fiw1jddm2h1qyr92csn3cllj6j1vm"; buildDepends = [ Boolean MemoTrie NumInstances ]; meta = { description = "Vector & affine spaces, linear maps, and derivatives"; diff --git a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix index b9da8408c55..8fdb0f1b254 100644 --- a/pkgs/development/libraries/haskell/vector-th-unbox/default.nix +++ b/pkgs/development/libraries/haskell/vector-th-unbox/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, dataDefault, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix index 7acc89d6a91..8951bf64fe2 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix index 1b8cb381f0b..05ac573abb2 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix index b9a7df50ba6..0ccaec71a86 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, primitive }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vinyl/default.nix b/pkgs/development/libraries/haskell/vinyl/default.nix index 725567ff16b..46ea723641c 100644 --- a/pkgs/development/libraries/haskell/vinyl/default.nix +++ b/pkgs/development/libraries/haskell/vinyl/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, doctest, lens, singletons }: cabal.mkDerivation (self: { pname = "vinyl"; - version = "0.4.1"; - sha256 = "1x8kxb4z4nj7h6pbl0r37rr7k88ly64cn0bf7izyaqjrsf0kxdci"; + version = "0.4.3"; + sha256 = "1npcpvr94l2gpk9z4y527raf2p3d6099m231vw0myci37ljnjgdf"; testDepends = [ doctest lens singletons ]; meta = { description = "Extensible Records"; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index 39cdcd8407f..a14775aaeb8 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hashable, semigroups }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index 913451de213..e8775c7d112 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, QuickCheck, random, regexBase, stm, text , time, vector, vty }: cabal.mkDerivation (self: { pname = "vty-ui"; - version = "1.7"; - sha256 = "1wd7ada3x7d5rhl4z3h29m9h42513vbz6dp49xhn4j806mi164nd"; + version = "1.7.1"; + sha256 = "1xgv2psbqcqpzgj1f1pis6hr7yvny8y9ajimllam7zsk6kbhngzz"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix index 8a8ed40adb4..36b6b78f65c 100644 --- a/pkgs/development/libraries/haskell/vty/4.7.5.nix +++ b/pkgs/development/libraries/haskell/vty/4.7.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random , stringQq, terminfo, utf8String, vector }: diff --git a/pkgs/development/libraries/haskell/vty/5.1.0.nix b/pkgs/development/libraries/haskell/vty/5.1.1.nix index b04f7ff33ed..708eb9581c6 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.0.nix +++ b/pkgs/development/libraries/haskell/vty/5.1.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, Cabal, dataDefault, deepseq, filepath , hashable, HUnit, lens, mtl, parallel, parsec, QuickCheck , quickcheckAssertions, random, smallcheck, stringQq, terminfo @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.0"; - sha256 = "0cq9y802z9wq69yw1yy916xsz6j7v8208k5mxixp41375cdm141x"; + version = "5.1.1"; + sha256 = "043vrazb8w6ljq14i390cwcmavgmbnjbs6sl6w0yx8cwb4f7djr5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 093fbb76f84..d22e57c576a 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, base64Bytestring, blazeBuilder, blazeHtml, blazeMarkup , byteable, cryptohash, cryptohashConduit, fileEmbed, filepath , hspec, httpDate, httpTypes, mimeTypes, network diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix index 10517e13d9c..6174784a134 100644 --- a/pkgs/development/libraries/haskell/wai-conduit/default.nix +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, httpTypes, transformers, wai }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index d54e8351d4f..76094cd0c0e 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, base64Bytestring, blazeBuilder , caseInsensitive, dataDefault, dataDefaultClass, deepseq , fastLogger, hspec, httpTypes, HUnit, liftedBase, network @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.0"; - sha256 = "0spjyimqfj7hx8zgmal4laqy8p1inj8hl2402b5s6zqdn36lldfs"; + version = "3.0.1"; + sha256 = "1k6d9p93r7r95i5yi7mvhix94qigkzanqjq5qa6k7qfpnjj727id"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network diff --git a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix index 7ecc3a34758..7e457ac3014 100644 --- a/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-fastcgi/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, fcgi, wai, waiExtra }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix index d103b54ec6d..e37df498ac8 100644 --- a/pkgs/development/libraries/haskell/wai-handler-launch/default.nix +++ b/pkgs/development/libraries/haskell/wai-handler-launch/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, httpTypes, streamingCommons, transformers , wai, warp }: diff --git a/pkgs/development/libraries/haskell/wai-logger/default.nix b/pkgs/development/libraries/haskell/wai-logger/default.nix index 35b044bdfb4..b7c62845cb9 100644 --- a/pkgs/development/libraries/haskell/wai-logger/default.nix +++ b/pkgs/development/libraries/haskell/wai-logger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, byteorder, caseInsensitive, doctest , fastLogger, httpTypes, network, unixTime, wai, waiTest }: diff --git a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix index 9ca7992db68..4c89a25dae8 100644 --- a/pkgs/development/libraries/haskell/wai-middleware-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-middleware-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, httpTypes, mtl, text, wai }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-test/default.nix b/pkgs/development/libraries/haskell/wai-test/default.nix index 5d1cecc2e50..8e08180b9e1 100644 --- a/pkgs/development/libraries/haskell/wai-test/default.nix +++ b/pkgs/development/libraries/haskell/wai-test/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, wai }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wai-websockets/default.nix b/pkgs/development/libraries/haskell/wai-websockets/default.nix index d0973881657..cb88d7ab6e6 100644 --- a/pkgs/development/libraries/haskell/wai-websockets/default.nix +++ b/pkgs/development/libraries/haskell/wai-websockets/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, caseInsensitive, fileEmbed, httpTypes , ioStreams, network, text, transformers, wai, waiAppStatic, warp , websockets diff --git a/pkgs/development/libraries/haskell/wai/default.nix b/pkgs/development/libraries/haskell/wai/default.nix index 50ded58f44d..6c70fede1ec 100644 --- a/pkgs/development/libraries/haskell/wai/default.nix +++ b/pkgs/development/libraries/haskell/wai/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, hspec, httpTypes, network, text, vault }: cabal.mkDerivation (self: { pname = "wai"; - version = "3.0.0.1"; - sha256 = "1f8alq4lygjdb4pzb7xm6jml3dviygk18siwfwb751va3j2fmi0v"; + version = "3.0.1"; + sha256 = "1889l6fbgvxn13yaskcvjrq07vs62ayvq8q5rn9cpq0yqyc6llcw"; buildDepends = [ blazeBuilder httpTypes network text vault ]; testDepends = [ blazeBuilder hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/warp-tls/default.nix b/pkgs/development/libraries/haskell/warp-tls/default.nix index ca20fe2d6bf..4eca4c8c192 100644 --- a/pkgs/development/libraries/haskell/warp-tls/default.nix +++ b/pkgs/development/libraries/haskell/warp-tls/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cprngAes, dataDefaultClass, network, streamingCommons, tls , wai, warp }: diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index d0940345a57..3065c52c0f9 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, blazeBuilder, caseInsensitive, doctest, hashable , hspec, HTTP, httpDate, httpTypes, HUnit, liftedBase, network , QuickCheck, simpleSendfile, streamingCommons, text, time @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.0.1"; - sha256 = "05x216fj7s1i963xipi0p7vmkz5l0nma1fjqiq040fg3rngw4yqb"; + version = "3.0.0.4"; + sha256 = "119yw4k11v2gq3z4gjr51i8z551cbbgwhkfnl9jr4ira06m6si2v"; buildDepends = [ blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/wcwidth/default.nix b/pkgs/development/libraries/haskell/wcwidth/default.nix index 0307642f62b..a3285791b6c 100644 --- a/pkgs/development/libraries/haskell/wcwidth/default.nix +++ b/pkgs/development/libraries/haskell/wcwidth/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, setlocale, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index ab89944d60f..110ee086c9b 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, boomerang, mtl, parsec, text, webRoutes }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 8c84f81bcc9..4eb4445d54d 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, httpTypes, HUnit, mtl, parsec, QuickCheck , split, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, testFrameworkTh, text, utf8String @@ -5,8 +7,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.27.5"; - sha256 = "1jx5wwmlylwrf45wy3w29ck1p7509mgy8m02vipd8apibx6ghp22"; + version = "0.27.6"; + sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp"; buildDepends = [ blazeBuilder httpTypes mtl parsec split text utf8String ]; diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix new file mode 100644 index 00000000000..d3a041d9a8d --- /dev/null +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault +, directoryTree, exceptions, filepath, httpClient, httpTypes +, liftedBase, monadControl, mtl, network, parallel, scientific +, temporary, text, time, transformers, transformersBase +, unorderedContainers, vector, zipArchive +}: + +cabal.mkDerivation (self: { + pname = "webdriver"; + version = "0.6.0.1"; + sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1"; + buildDepends = [ + aeson attoparsec base64Bytestring cond dataDefault directoryTree + exceptions filepath httpClient httpTypes liftedBase monadControl + mtl network scientific temporary text time transformers + transformersBase unorderedContainers vector zipArchive + ]; + testDepends = [ parallel text ]; + jailbreak = true; + doCheck = false; + meta = { + homepage = "https://github.com/kallisti-dev/hs-webdriver"; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/websockets-snap/default.nix b/pkgs/development/libraries/haskell/websockets-snap/default.nix index dfb4e3a110f..29fcc454112 100644 --- a/pkgs/development/libraries/haskell/websockets-snap/default.nix +++ b/pkgs/development/libraries/haskell/websockets-snap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, enumerator, ioStreams, mtl, snapCore , snapServer, websockets }: diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index e712a5b2b81..782b3bdfc75 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base64Bytestring, binary, blazeBuilder , caseInsensitive, entropy, HUnit, ioStreams, mtl, network , QuickCheck, random, SHA, testFramework, testFrameworkHunit @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.8.2.4"; - sha256 = "09mq04vhi53isj8z5930ibyai7bv634lnmhl4xl2d3fzz2afvff0"; + version = "0.8.2.6"; + sha256 = "074d0wkxy2qyi8w9cjgbalqi8b21wf5ak71lcnh94iw76dfxbizf"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy ioStreams mtl network random SHA text @@ -17,6 +19,7 @@ cabal.mkDerivation (self: { entropy HUnit ioStreams mtl network QuickCheck random SHA testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; + jailbreak = true; meta = { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; diff --git a/pkgs/development/libraries/haskell/wizards/default.nix b/pkgs/development/libraries/haskell/wizards/default.nix index 08c88138101..ce1dd579697 100644 --- a/pkgs/development/libraries/haskell/wizards/default.nix +++ b/pkgs/development/libraries/haskell/wizards/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, controlMonadFree, haskeline, mtl, transformers }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index dd32750ffe9..ac8d69ebd3f 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HUnit, nats, semigroupoids, semigroups, testFramework , testFrameworkHunit, text, utf8String }: diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 9bb8e57172d..5a3c75f6165 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, nats, semigroups, terminfo, text, transformers , wlPprintExtras }: diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index e951163fc8a..cb2d02d43dd 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wl-pprint/default.nix b/pkgs/development/libraries/haskell/wl-pprint/default.nix index 9849d4fab0e..a0ee669395d 100644 --- a/pkgs/development/libraries/haskell/wl-pprint/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/word8/default.nix b/pkgs/development/libraries/haskell/word8/default.nix index 535f4103d12..ad6b5915383 100644 --- a/pkgs/development/libraries/haskell/word8/default.nix +++ b/pkgs/development/libraries/haskell/word8/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec }: cabal.mkDerivation (self: { pname = "word8"; - version = "0.0.4"; - sha256 = "1jrys2crl1yfkgwc4ny6x1kr24kx8j3zsy0zql5ms19rfb0rnkki"; + version = "0.1.1"; + sha256 = "1xpa0haacimrblxg3x3n5vdcnkg3ff5zqamppdarv0zvkcdj139r"; testDepends = [ hspec ]; meta = { description = "Word8 library"; diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 30fa943d085..8e95e3c8238 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, doctest, exceptions, filepath , httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes , temporary, testFramework, testFrameworkHunit, text, time diff --git a/pkgs/development/libraries/haskell/wxHaskell/wx.nix b/pkgs/development/libraries/haskell/wxHaskell/wx.nix index 90bfdc5ca0a..c10897b4b11 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wx.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wx.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, stm, wxcore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix index b816c3007f9..4026a892f6e 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxc.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxc.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libX11, mesa, wxdirect, wxGTK }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix index d404099bf53..8fc4df1a0ce 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxcore.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, libX11, mesa, parsec, stm, time, wxc, wxdirect , wxGTK }: diff --git a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix index b369fe407da..1362b423753 100644 --- a/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix +++ b/pkgs/development/libraries/haskell/wxHaskell/wxdirect.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, parsec, strict, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix index 100b5ca2835..9b060630edb 100644 --- a/pkgs/development/libraries/haskell/x509-store/default.nix +++ b/pkgs/development/libraries/haskell/x509-store/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl , pem, time, x509 }: diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix index c5467722294..b36b8c9cdfb 100644 --- a/pkgs/development/libraries/haskell/x509-system/default.nix +++ b/pkgs/development/libraries/haskell/x509-system/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, mtl, pem, time, x509, x509Store }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix index 27f5d6ecbbe..32176c8f4b8 100644 --- a/pkgs/development/libraries/haskell/x509-validation/default.nix +++ b/pkgs/development/libraries/haskell/x509-validation/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Types, byteable, cryptohash , cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl , network, pem, time, x509, x509Store diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index d8fd7030f14..4c8eb53c995 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash , cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time diff --git a/pkgs/development/libraries/haskell/xdg-basedir/default.nix b/pkgs/development/libraries/haskell/xdg-basedir/default.nix index 3a12faf07c9..bc92d97b1ca 100644 --- a/pkgs/development/libraries/haskell/xdg-basedir/default.nix +++ b/pkgs/development/libraries/haskell/xdg-basedir/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 78a9d921ff6..6080afac5d5 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, graphviz, gtk, mtl, polyparse, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix index 605339d0811..d828ba1a57c 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix index 3a72cb8fba0..134c423eca1 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix index 05e13b4a7b3..2b375904ed0 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.0.5.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix index 66196c806ac..45304858b15 100644 --- a/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix +++ b/pkgs/development/libraries/haskell/xhtml/3000.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index 4f3e7fcebb7..7468bc96bd0 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, attoparsecConduit, blazeBuilder , blazeBuilderConduit, blazeHtml, blazeMarkup, conduit , conduitExtra, dataDefault, deepseq, hspec, HUnit, monadControl @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.0.2"; - sha256 = "1kcrhyri4knkp1x9zn99qklkj4nd47gwdfy6q0pwdz7cgjskps1z"; + version = "1.2.1"; + sha256 = "1bh0d2fqcdbx2dq5ybipf7ws59blrb8yd98z1rnbvv1fj9r0xw10"; buildDepends = [ attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq diff --git a/pkgs/development/libraries/haskell/xml-hamlet/default.nix b/pkgs/development/libraries/haskell/xml-hamlet/default.nix index 16e4abfa2cd..e1c0c862078 100644 --- a/pkgs/development/libraries/haskell/xml-hamlet/default.nix +++ b/pkgs/development/libraries/haskell/xml-hamlet/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, parsec, shakespeare, text, xmlConduit }: cabal.mkDerivation (self: { pname = "xml-hamlet"; - version = "0.4.0.8"; - sha256 = "10hc4a6lqifiinm9rf1ziw35bjnjgkd5mhagg9anvz35hhr7bbrr"; + version = "0.4.0.9"; + sha256 = "0vm4jhvjf53a33sisnhghg0m9pcv2fx676rl90vbm2xcd9rqlj82"; buildDepends = [ parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; meta = { diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix index 7c4496f974f..fd9609ec25f 100644 --- a/pkgs/development/libraries/haskell/xml-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-lens/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, lens, text, xmlConduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xml-types/default.nix b/pkgs/development/libraries/haskell/xml-types/default.nix index 94a7d3f7dff..e9cfd5e6b28 100644 --- a/pkgs/development/libraries/haskell/xml-types/default.nix +++ b/pkgs/development/libraries/haskell/xml-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xml/default.nix b/pkgs/development/libraries/haskell/xml/default.nix index 072e5d8bc1c..3081f085509 100644 --- a/pkgs/development/libraries/haskell/xml/default.nix +++ b/pkgs/development/libraries/haskell/xml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xmlgen/default.nix b/pkgs/development/libraries/haskell/xmlgen/default.nix index c466ddb1d55..9f4b08d5bbc 100644 --- a/pkgs/development/libraries/haskell/xmlgen/default.nix +++ b/pkgs/development/libraries/haskell/xmlgen/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, filepath, HUnit, hxt, mtl, QuickCheck, text }: diff --git a/pkgs/development/libraries/haskell/xmlhtml/default.nix b/pkgs/development/libraries/haskell/xmlhtml/default.nix index 659da9c8baa..794808eed0d 100644 --- a/pkgs/development/libraries/haskell/xmlhtml/default.nix +++ b/pkgs/development/libraries/haskell/xmlhtml/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, blazeHtml, blazeMarkup, parsec, text , unorderedContainers }: diff --git a/pkgs/development/libraries/haskell/xournal-parser/default.nix b/pkgs/development/libraries/haskell/xournal-parser/default.nix index d874543a967..68f10cc566b 100644 --- a/pkgs/development/libraries/haskell/xournal-parser/default.nix +++ b/pkgs/development/libraries/haskell/xournal-parser/default.nix @@ -1,17 +1,19 @@ -{ cabal, attoparsec, attoparsecConduit, conduit, lens, mtl, strict -, text, transformers, xmlConduit, xmlTypes, xournalTypes -, zlibConduit +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, attoparsecConduit, conduit, conduitExtra +, exceptions, lens, mtl, strict, text, transformers, xmlConduit +, xmlTypes, xournalTypes, zlibConduit }: cabal.mkDerivation (self: { pname = "xournal-parser"; - version = "0.5.0.2"; - sha256 = "1s9z7s6mcsn4s2krrcb1x63ca1d0rpyzdhb147w9524qw7gvbjin"; + version = "0.5.0.3"; + sha256 = "1r99xv7w2gxms1ff5qpj36dcb3gb5lpccr1mjjdnkcij81i748ly"; buildDepends = [ - attoparsec attoparsecConduit conduit lens mtl strict text - transformers xmlConduit xmlTypes xournalTypes zlibConduit + attoparsec attoparsecConduit conduit conduitExtra exceptions lens + mtl strict text transformers xmlConduit xmlTypes xournalTypes + zlibConduit ]; - jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Xournal file parser"; diff --git a/pkgs/development/libraries/haskell/xournal-types/default.nix b/pkgs/development/libraries/haskell/xournal-types/default.nix index 2281520703f..7d6eb7e6efb 100644 --- a/pkgs/development/libraries/haskell/xournal-types/default.nix +++ b/pkgs/development/libraries/haskell/xournal-types/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cereal, lens, strict, TypeCompose }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/xss-sanitize/default.nix b/pkgs/development/libraries/haskell/xss-sanitize/default.nix index 31f7a06c1fe..4c48eeeb062 100644 --- a/pkgs/development/libraries/haskell/xss-sanitize/default.nix +++ b/pkgs/development/libraries/haskell/xss-sanitize/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, cssText, hspec, HUnit, network, tagsoup, text , utf8String }: diff --git a/pkgs/development/libraries/haskell/xtest/default.nix b/pkgs/development/libraries/haskell/xtest/default.nix index d9ce47647ca..dd381439d67 100644 --- a/pkgs/development/libraries/haskell/xtest/default.nix +++ b/pkgs/development/libraries/haskell/xtest/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, libXtst, X11 }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yaml-light/default.nix b/pkgs/development/libraries/haskell/yaml-light/default.nix index 7999075f89e..26e698b1dbf 100644 --- a/pkgs/development/libraries/haskell/yaml-light/default.nix +++ b/pkgs/development/libraries/haskell/yaml-light/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, HsSyck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 502a11e8125..88475a1e951 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet , scientific, text, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.8.3"; - sha256 = "031d1wx31mw9lw0swlcf1xfzdixaq6wmglhzaj9sixhid0r2isvf"; + version = "0.8.8.4"; + sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yap/default.nix b/pkgs/development/libraries/haskell/yap/default.nix index e21948de974..c7eb1f180e4 100644 --- a/pkgs/development/libraries/haskell/yap/default.nix +++ b/pkgs/development/libraries/haskell/yap/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index a54c714e979..b439d24afe6 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsecConduit, authenticate, base16Bytestring , base64Bytestring, binary, blazeBuilder, blazeHtml, blazeMarkup , byteable, conduit, conduitExtra, cryptohash, dataDefault @@ -10,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.3.1"; - sha256 = "1fv5z938rpiyhkl4zjb2ss496bgqvdvn7di5im089zmxvx1m81lz"; + version = "1.3.1.1"; + sha256 = "0mw04v8gnhv9gnv7kv2v1x5df63zjdmi52r5bv1fzqay1s5b83ir"; buildDepends = [ aeson attoparsecConduit authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 145df1e625f..4e02a157e34 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, base64Bytestring, blazeBuilder, Cabal, conduit , conduitExtra, dataDefaultClass, fileEmbed, filepath, fsnotify , ghcPaths, httpConduit, httpReverseProxy, httpTypes, liftedBase @@ -10,8 +12,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.2.10.2"; - sha256 = "18faylxjrd790xv6zr77wikkcy99l7824bb1sq1y225kd7a3alsm"; + version = "1.2.11"; + sha256 = "15bxl52ky0ihm7ak71g6cvb9bac4zvmb8sh74fbjkckmpgh8r3m2"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 7ea674aa0d9..96995f24d31 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, async, attoparsecConduit, blazeBuilder, blazeHtml , blazeMarkup, caseInsensitive, cereal, clientsession, conduit , conduitExtra, cookie, dataDefault, deepseq, exceptions @@ -11,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.2.16.1"; - sha256 = "1wr5labhp3wc23ki2wvaypanm54qw9vz3v77rxyj1za1y2n1cprw"; + version = "1.2.17"; + sha256 = "199zj9yz5nmk4h2dwz4zlix3wf1z5fl9a8jg8cr4z6ldgskcfis1"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie diff --git a/pkgs/development/libraries/haskell/yesod-default/default.nix b/pkgs/development/libraries/haskell/yesod-default/default.nix index 58ea0b10a22..578ec4f58a1 100644 --- a/pkgs/development/libraries/haskell/yesod-default/default.nix +++ b/pkgs/development/libraries/haskell/yesod-default/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, yesodCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 4309df0e4c4..26f0735f723 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , byteable, dataDefault, emailValidate, hamlet, hspec, network , persistent, resourcet, shakespeare, shakespeareCss, shakespeareJs @@ -7,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.3.10"; - sha256 = "1qq0r5phb6xygz4w5ysir3ky7bw0rmd1q4vz57dz1aza2pchb1ih"; + version = "1.3.11"; + sha256 = "15c4qyvz1mn56pl9add865lm351wjhdhrbzm87py2jliglm905n0"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate hamlet network persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod-json/default.nix b/pkgs/development/libraries/haskell/yesod-json/default.nix index 780444bd861..53c5d2c7e85 100644 --- a/pkgs/development/libraries/haskell/yesod-json/default.nix +++ b/pkgs/development/libraries/haskell/yesod-json/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, yesodCore }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-persistent/default.nix b/pkgs/development/libraries/haskell/yesod-persistent/default.nix index f5189caa46f..ce13f78b31b 100644 --- a/pkgs/development/libraries/haskell/yesod-persistent/default.nix +++ b/pkgs/development/libraries/haskell/yesod-persistent/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, blazeBuilder, conduit, hspec, persistent, persistentSqlite , persistentTemplate, resourcePool, resourcet, text, transformers , waiExtra, waiTest, yesodCore diff --git a/pkgs/development/libraries/haskell/yesod-routes/default.nix b/pkgs/development/libraries/haskell/yesod-routes/default.nix index d1337248415..f537a119a45 100644 --- a/pkgs/development/libraries/haskell/yesod-routes/default.nix +++ b/pkgs/development/libraries/haskell/yesod-routes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, HUnit, pathPieces, text, vector }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index d5a0c1c4c7d..7b118711cce 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, attoparsec, base64Bytestring, blazeBuilder , byteable, conduit, conduitExtra, cryptohash, cryptohashConduit , cssText, dataDefault, fileEmbed, filepath, hashable, hjsmin diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 44b14758623..41f8f694ca1 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup , caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit , monadControl, network, persistent, text, time, transformers, wai @@ -6,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.2.3"; - sha256 = "082zi53q1pw9xv4l6ld1y3xxnvq3iwgbrdnxjknhwsxph7glkn3p"; + version = "1.2.3.1"; + sha256 = "0q4w7q22d8hvsg939w686fb295v8cznnhqlfd1bh0v2lp9dih4ms"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive cookie hspec htmlConduit httpTypes HUnit monadControl network diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 8e3873df2ae..d43100901cc 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,20 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault , fastLogger, hamlet, monadControl, monadLogger, networkConduit -, safe, shakespeare, shakespeareCss, shakespeareJs, text -, transformers, unorderedContainers, wai, waiExtra, warp, yaml -, yesodAuth, yesodCore, yesodForm, yesodPersistent +, safe, shakespeare, shakespeareCss, shakespeareJs +, streamingCommons, text, transformers, unorderedContainers, wai +, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm +, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.2.6"; - sha256 = "0rw46zznczdzg2wvbgp5kpq3yrl6w40vbbs7zyvqpcf6m82jsfz0"; + version = "1.2.6.1"; + sha256 = "1xiqpbcjxisc4lic7ls03rz184d95vkh4kb3ampwbx463qbj9im2"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger hamlet monadControl monadLogger networkConduit safe shakespeare - shakespeareCss shakespeareJs text transformers unorderedContainers - wai waiExtra warp yaml yesodAuth yesodCore yesodForm - yesodPersistent + shakespeareCss shakespeareJs streamingCommons text transformers + unorderedContainers wai waiExtra warp yaml yesodAuth yesodCore + yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; diff --git a/pkgs/development/libraries/haskell/yst/default.nix b/pkgs/development/libraries/haskell/yst/default.nix index 8b381bd214e..9597861c6fe 100644 --- a/pkgs/development/libraries/haskell/yst/default.nix +++ b/pkgs/development/libraries/haskell/yst/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, csv, filepath, HDBC, HDBCSqlite3, HStringTemplate , pandoc, parsec, scientific, split, text, time , unorderedContainers, xhtml, yaml diff --git a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix index 20d414ac6b1..c7be4e280dc 100644 --- a/pkgs/development/libraries/haskell/zeromq-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, QuickCheck, testFramework, testFrameworkQuickcheck2 , zeromq }: diff --git a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix index 820f174e129..f4449cdc856 100644 --- a/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq3-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiTerminal, async, checkers, MonadCatchIOTransformers , QuickCheck, semigroups, transformers, zeromq }: diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix index abe8cd3430c..0e2cf67a19f 100644 --- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, async, exceptions, QuickCheck, semigroups, tasty , tastyHunit, tastyQuickcheck, transformers, zeromq }: diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix index 44a14259b40..422d81e6707 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.2.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix index f1a36feda90..20795a15a98 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, digest, filepath, HUnit, mtl, text, time, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zipper/default.nix b/pkgs/development/libraries/haskell/zipper/default.nix index 5ff1da422ef..4c31b2c2d01 100644 --- a/pkgs/development/libraries/haskell/zipper/default.nix +++ b/pkgs/development/libraries/haskell/zipper/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, multirec }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zippers/default.nix b/pkgs/development/libraries/haskell/zippers/default.nix new file mode 100644 index 00000000000..939de519fb1 --- /dev/null +++ b/pkgs/development/libraries/haskell/zippers/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, doctest, filepath, lens, profunctors, semigroupoids }: + +cabal.mkDerivation (self: { + pname = "zippers"; + version = "0.2"; + sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls"; + buildDepends = [ lens profunctors semigroupoids ]; + testDepends = [ doctest filepath ]; + meta = { + homepage = "http://github.com/ekmett/zippers/"; + description = "Traversal based zippers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/zlib-bindings/default.nix b/pkgs/development/libraries/haskell/zlib-bindings/default.nix index ba4751af2fe..9dd91fa1f72 100644 --- a/pkgs/development/libraries/haskell/zlib-bindings/default.nix +++ b/pkgs/development/libraries/haskell/zlib-bindings/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, QuickCheck, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib-conduit/default.nix b/pkgs/development/libraries/haskell/zlib-conduit/default.nix index 3029cc8c3b6..596dbdfb21e 100644 --- a/pkgs/development/libraries/haskell/zlib-conduit/default.nix +++ b/pkgs/development/libraries/haskell/zlib-conduit/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, conduit }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib-enum/default.nix b/pkgs/development/libraries/haskell/zlib-enum/default.nix index 7dc700b3532..928511be957 100644 --- a/pkgs/development/libraries/haskell/zlib-enum/default.nix +++ b/pkgs/development/libraries/haskell/zlib-enum/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, enumerator, transformers, zlibBindings }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix index 28f109e8c36..6e44732abec 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.0.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix index 6a917af1fe7..190c2b0cc72 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.2.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix index f13b9f7b1d4..73e6e42f701 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix index bba9e1a13fe..8902e9f75e3 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.3.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix index abeed295e03..cabb6875a0d 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix index c1fa7d78d0a..90c693376b9 100644 --- a/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix +++ b/pkgs/development/libraries/haskell/zlib/0.5.4.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, zlib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index 12628e4c53d..a029eab6f12 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { sed -i -e "s|/bin/sh|${stdenv.shell}|" configure ''; - configureFlags = "--disable-debug"; + configureFlags = "--disable-debug" + + stdenv.lib.optionalString stdenv.isDarwin " --enable-rpath"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix new file mode 100644 index 00000000000..75704848f7f --- /dev/null +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk +, gtk_doc, gtk3, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +}: + +stdenv.mkDerivation rec { + name = "keybinder3-${version}"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "engla"; + repo = "keybinder"; + rev = "keybinder-3.0-v${version}"; + sha256 = "1jdcrfhvqffhc2h69197wkpc5j5synk5mm8rqhz27qfrfhh4vf0q"; + }; + + buildInputs = [ + autoconf automake libtool pkgconfig gnome3.gnome_common gtk_doc + libX11 libXext libXrender gobjectIntrospection gtk3 + ]; + + preConfigure = '' + ./autogen.sh --prefix="$out" + ''; + + meta = with stdenv.lib; { + description = "Library for registering global key bindings"; + homepage = https://github.com/engla/keybinder/; + license = licenses.mit; + platform = platforms.linux; + maintainers = [ maintainers.cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 97dda155dc1..f1f1c7dd909 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng }: stdenv.mkDerivation rec { - name = "lensfun-0.2.7"; + name = "lensfun-0.2.8"; src = fetchurl { url = "mirror://sourceforge/lensfun/${name}.tar.bz2"; - sha256 = "0xv4h219zn0ldhhjnjc1q2bgpbfqzpd4b31gf9yyrwbapm3hgprx"; + sha256 = "0j0smagnksdm9gjnk13w200hjxshmxf2kvyxxnra4nc2qzxrg3zq"; }; patchPhase = "sed -e 's@/usr/bin/python@${python}/bin/python@' -i configure"; diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix new file mode 100644 index 00000000000..0e8dae7bb91 --- /dev/null +++ b/pkgs/development/libraries/libatomic_ops/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl}: +let + s = # Generated upstream information + rec { + baseName="libatomic_ops"; + version="7.4.2"; + name="${baseName}-${version}"; + hash="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4"; + url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.2.tar.gz"; + sha256="1pdm0h1y7bgkczr8byg20r6bq15m5072cqm5pny4f9crc9gn3yh4"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libatomic_ops/default.upstream b/pkgs/development/libraries/libatomic_ops/default.upstream new file mode 100644 index 00000000000..c9fd4554e4a --- /dev/null +++ b/pkgs/development/libraries/libatomic_ops/default.upstream @@ -0,0 +1 @@ +url https://github.com/ivmai/libatomic_ops/wiki/Download diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix new file mode 100644 index 00000000000..036c918b32d --- /dev/null +++ b/pkgs/development/libraries/libcredis/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libcredis-0.2.3"; + + src = fetchurl { + url = "https://credis.googlecode.com/files/credis-0.2.3.tar.gz"; + sha256 = "1l3hlw9rrc11qggbg9a2303p3bhxxx2vqkmlk8avsrbqw15r1ayr"; + }; + + # credis build system has no install actions, provide our own. + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + mkdir -p "$out/include" + + cp -v credis-test "$out/bin/" + cp -v *.a *.so "$out/lib/" + cp -v *.h "$out/include/" + ''; + + meta = with stdenv.lib; { + description = "C client library for Redis (key-value database)"; + homepage = https://code.google.com/p/credis/; + license = licenses.bsd3; # from homepage + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libe-book/0.0.nix b/pkgs/development/libraries/libe-book/0.0.nix new file mode 100644 index 00000000000..2dc8de67039 --- /dev/null +++ b/pkgs/development/libraries/libe-book/0.0.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit +, libwpd}: +let + s = # Generated upstream information + rec { + baseName="libe-book"; + version="0.0.3"; + name="${baseName}-${version}"; + hash="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i"; + url="mirror://sourceforge/project/libebook/libe-book-0.0.3/libe-book-0.0.3.tar.xz"; + sha256="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i"; + }; + buildInputs = [ + gperf pkgconfig librevenge libxml2 boost icu cppunit libwpd + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''Library for import of reflowable e-book formats''; + license = stdenv.lib.licenses.lgpl21Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libe-book/0.0.upstream b/pkgs/development/libraries/libe-book/0.0.upstream new file mode 100644 index 00000000000..e2994f52691 --- /dev/null +++ b/pkgs/development/libraries/libe-book/0.0.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libebook/files/ +SF_version_dir libe-book-0.0. +version_link '[.]tar.xz/download$' +SF_redirect diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix new file mode 100644 index 00000000000..6dc384de204 --- /dev/null +++ b/pkgs/development/libraries/libe-book/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit}: +let + s = # Generated upstream information + rec { + baseName="libe-book"; + version="0.1.1"; + name="${baseName}-${version}"; + hash="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a"; + url="mirror://sourceforge/project/libebook/libe-book-0.1.1/libe-book-0.1.1.tar.xz"; + sha256="0awv96q92qgxk22w2vrf4vg90cab5qfsrkbhgz252722mrkd5p4a"; + }; + buildInputs = [ + gperf pkgconfig librevenge libxml2 boost icu cppunit + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''Library for import of reflowable e-book formats''; + license = stdenv.lib.licenses.lgpl21Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libe-book/default.upstream b/pkgs/development/libraries/libe-book/default.upstream new file mode 100644 index 00000000000..30a6d390787 --- /dev/null +++ b/pkgs/development/libraries/libe-book/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libebook/files/ +SF_version_dir libe-book- +version_link '[.]tar.xz/download$' +SF_redirect diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix new file mode 100644 index 00000000000..2776a3c0614 --- /dev/null +++ b/pkgs/development/libraries/libevdev/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + name = "libevdev-1.2"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; + sha256 = "0h54ym5rsmicl4gx7gcdaifpyndakbl38c5dcxgr27f0cy0635a1"; + }; + + buildInputs = [ python ]; + + meta = with stdenv.lib; { + description = "Wrapper library for evdev devices"; + homepage = http://www.freedesktop.org/software/libevdev/doc/latest/index.html; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.amorsillo ]; + }; +} diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix new file mode 100644 index 00000000000..3ebfb5d8cfc --- /dev/null +++ b/pkgs/development/libraries/libivykis/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, protobufc }: + +stdenv.mkDerivation rec { + name = "libivykis-${version}"; + + version = "0.39"; + + src = fetchurl { + url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz"; + sha256 = "11d7sjbhcll932rlvx9sf3vk60b5bazmjf4vlr4qd9cz0cashizz"; + }; + + buildInputs = [ autoconf automake libtool pkgconfig file protobufc ]; + + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = '' + A thin wrapper over various OS'es implementation of I/O readiness + notification facilities + ''; + license = licenses.zlib; + maintainers = [ maintainers.rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix new file mode 100644 index 00000000000..7a754a28e3d --- /dev/null +++ b/pkgs/development/libraries/liblogging/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, pkgconfig, systemd }: + +stdenv.mkDerivation rec { + name = "liblogging-1.0.4"; + + src = fetchurl { + url = "http://download.rsyslog.com/liblogging/${name}.tar.gz"; + sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc"; + }; + + buildInputs = [ pkgconfig systemd ]; + + meta = { + description = "Lightweight signal-safe logging library"; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index ebd0d08717d..16196c9abc9 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -8,11 +8,17 @@ stdenv.mkDerivation rec { sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; + # Fix linking against libpthread (patch from Fedora) + # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 + # https://bugs.launchpad.net/libmemcached/+bug/1281907 + patches = [ ./libmemcached-fix-linking-with-libpthread.patch ]; + buildInputs = [ cyrus_sasl libevent ]; - meta = { + meta = with stdenv.lib; { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; - license = "BSD"; + license = licenses.bsd3; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch b/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch new file mode 100644 index 00000000000..e5e21c43358 --- /dev/null +++ b/pkgs/development/libraries/libmemcached/libmemcached-fix-linking-with-libpthread.patch @@ -0,0 +1,19 @@ +diff -up libmemcached-1.0.16/build-aux/ltmain.sh.orig libmemcached-1.0.16/build-aux/ltmain.sh +--- libmemcached-1.0.16/build-aux/ltmain.sh.orig 2013-12-03 16:36:53.222107642 +0100 ++++ libmemcached-1.0.16/build-aux/ltmain.sh 2013-12-03 16:37:35.770132249 +0100 +@@ -5664,6 +5664,15 @@ func_mode_link () + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac ++ # As we are forced to pass -nostdlib to g++ during linking, the option ++ # -pthread{,s} is not in effect; add the -lpthread to $deplist ++ # explicitly to link correctly. ++ if test "$tagname" = CXX -a x"$with_gcc" = xyes; then ++ case "$arg" in ++ -pthread*) func_append deplibs " -lpthread" ;; ++ esac ++ fi ++ + continue + ;; + diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix new file mode 100644 index 00000000000..f78604f86c5 --- /dev/null +++ b/pkgs/development/libraries/libmm-qt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qt4, doxygen, modemmanager }: + +let + pname = "libmm-qt"; + version = "1.0.1"; + name = "${pname}-${version}"; +in +stdenv.mkDerivation { + inherit name; + + buildInputs = [ + cmake + pkgconfig + qt4 + doxygen + ]; + + propagatedBuildInputs = [ modemmanager ]; + + src = fetchurl { + url = "mirror://kde/unstable/modemmanager-qt/${version}/src/${name}-1.tar.xz"; + sha256 = "0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a"; + }; + + meta = with stdenv.lib; { + homepage = "https://projects.kde.org/projects/extragear/libs/libmm-qt"; + description = "Qt wrapper for ModemManager DBus API"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.jgeerds ]; + }; +} diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix new file mode 100644 index 00000000000..9ad2498dfa0 --- /dev/null +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl, libtool, libmad }: + +stdenv.mkDerivation rec { + name = "libmp3splt-0.9.1"; + + src = fetchurl { + url = "http://prdownloads.sourceforge.net/mp3splt/${name}.tar.gz"; + sha256 = "17ar9d669cnirkz1kdrim687wzi36y8inapnj4svlsvr00vdzfxa"; + }; + + buildInputs = [ libtool libmad ]; + + configureFlags = "--disable-pcre"; + + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/mp3splt/; + description = "utility to split mp3, ogg vorbis and FLAC files without decoding"; + maintainers = with maintainers; [ bosu ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libmwaw/0.2.nix b/pkgs/development/libraries/libmwaw/0.2.nix new file mode 100644 index 00000000000..d66414b6814 --- /dev/null +++ b/pkgs/development/libraries/libmwaw/0.2.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +let + s = # Generated upstream information + rec { + baseName="libmwaw"; + version="0.2.1"; + name="${baseName}-${version}"; + hash="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn"; + url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.2.1/libmwaw-0.2.1.tar.xz"; + sha256="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn"; + }; + buildInputs = [ + boost pkgconfig cppunit zlib libwpg libwpd librevenge + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''Import library for some old mac text documents''; + license = stdenv.lib.licenses.mpl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmwaw/0.2.upstream b/pkgs/development/libraries/libmwaw/0.2.upstream new file mode 100644 index 00000000000..8ce00ecf767 --- /dev/null +++ b/pkgs/development/libraries/libmwaw/0.2.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libmwaw/files/libmwaw/ +SF_version_dir libmwaw-0.2. +version_link '[.]tar.xz/download$' +SF_redirect diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix new file mode 100644 index 00000000000..0a7b76edab1 --- /dev/null +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +let + s = # Generated upstream information + rec { + baseName="libmwaw"; + version="0.3.1"; + name="${baseName}-${version}"; + hash="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb"; + url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.3.1/libmwaw-0.3.1.tar.xz"; + sha256="0fa6nf4pxl853xnh2kdjw1nk3w6i39diixiampml7g9qygbd0vqb"; + }; + buildInputs = [ + boost pkgconfig cppunit zlib libwpg libwpd librevenge + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''Import library for some old mac text documents''; + license = stdenv.lib.licenses.mpl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmwaw/default.upstream b/pkgs/development/libraries/libmwaw/default.upstream new file mode 100644 index 00000000000..0db6d23a52f --- /dev/null +++ b/pkgs/development/libraries/libmwaw/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libmwaw/files/libmwaw/ +SF_version_dir libmwaw- +version_link '[.]tar.xz/download$' +SF_redirect diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix new file mode 100644 index 00000000000..44c8b406e45 --- /dev/null +++ b/pkgs/development/libraries/libnm-qt/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }: + +let + pname = "libnm-qt"; + version = "0.9.8.1"; + name = "${pname}-${version}"; +in +stdenv.mkDerivation { + inherit name; + + buildInputs = [ + cmake + pkgconfig + qt4 + networkmanager + ]; + + propagatedBuildInputs = [ libmm-qt ]; + + src = fetchurl { + url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz"; + sha256 = "cde8bed2beb57015cb5f6772c1fe0843aab299b9529578c5406ba7fe614af23d"; + }; + + meta = with stdenv.lib; { + homepage = "https://projects.kde.org/projects/extragear/libs/libnm-qt"; + description = "Qt wrapper for NetworkManager DBus API"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.jgeerds ]; + }; +} diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix new file mode 100644 index 00000000000..2e6c58c804e --- /dev/null +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: +let + s = # Generated upstream information + rec { + baseName="libodfgen"; + version="0.1.1"; + name="${baseName}-${version}"; + hash="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; + url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.1/libodfgen-0.1.1.tar.xz"; + sha256="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; + }; + buildInputs = [ + boost pkgconfig cppunit zlib libwpg libwpd librevenge + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A base library for generating ODF documents''; + license = stdenv.lib.licenses.mpl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libodfgen/default.upstream b/pkgs/development/libraries/libodfgen/default.upstream new file mode 100644 index 00000000000..44f66561bd8 --- /dev/null +++ b/pkgs/development/libraries/libodfgen/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libwpd/files/libodfgen/ +SF_version_dir libodfgen- +version_link '[.]tar.xz/download$' +SF_redirect diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index b11b1202080..492538f1802 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, xz }: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "libogg-1.3.1"; +let + name = "libogg-1.3.2"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "1ynwij1qdibwb2nvcl3ixri0c6pvq1higl96hf87iyqsv1wasnrs"; + sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z"; }; - nativeBuildInputs = [ xz ]; - - meta = { + meta = with stdenv.lib; { homepage = http://xiph.org/ogg/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix new file mode 100644 index 00000000000..0eb735900b3 --- /dev/null +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup +, libxslt, check, vala ? null +}: + +stdenv.mkDerivation rec { + name = "libosinfo-0.2.10"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/libosinfo/${name}.tar.gz"; + sha256 = "564bd487a39dc09a10917c1d7a95f739ee7701d9cd0fbabcacea64f615e20a2d"; + }; + + buildInputs = [ + pkgconfig intltool gobjectIntrospection libsoup libxslt check vala + ]; + + meta = with stdenv.lib; { + description = "Info about OSs, hypervisors and (virtual) hardware devices"; + homepage = http://libosinfo.org/; + license = licenses.lgpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index cc9139d664e..c67df46e89c 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.9"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1c99ygs46qhd4a0ardxhdyjaw5p8clhzmsm8jydqxnmbakwy518m"; + sha256 = "1i98z9qw3jpkaq419189vr8h3qcxqlz40dls77rbn4c0agc69703"; }; buildInputs = [zlib openssl]; makeFlags = [ @@ -19,5 +19,9 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; bsd3; + inherit version; + downloadPage = "http://www.creytiv.com/pub/"; + updateWalker = true; + downloadURLRegexp = "/re-.*[.]tar[.].*"; }; } diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 04f3cc97bf3..fe49609ce68 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, zlib, openssl, libre}: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.6"; name = "librem-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/rem-${version}.tar.gz"; - sha256 = "55c66118e3026c5ed42d8b9e0c668149baefe83f1aa76394cddba2d72f45d5c7"; + sha256 = "0rgqy9pqn730ijxvz1gk0virsf6jwjmq02s99jqqrfm3p0g6zs3w"; }; buildInputs = [zlib openssl libre]; makeFlags = [ @@ -20,5 +20,9 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; bsd3; + inherit version; + downloadPage = "http://www.creytiv.com/pub/"; + updateWalker = true; + downloadURLRegexp = "/rem-.*[.]tar[.].*"; }; } diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix new file mode 100644 index 00000000000..8ddf026a1bc --- /dev/null +++ b/pkgs/development/libraries/librevenge/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib}: +let + s = # Generated upstream information + rec { + baseName="librevenge"; + version="0.0.1"; + name="${baseName}-${version}"; + hash="0zgfxvbqf11pypyc0vmcan73x197f7ia1ywin9qqy9hvvmrjgchc"; + url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.1/librevenge-0.0.1.tar.xz"; + sha256="0zgfxvbqf11pypyc0vmcan73x197f7ia1ywin9qqy9hvvmrjgchc"; + }; + buildInputs = [ + boost pkgconfig cppunit zlib + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''A base library for writing document import filters''; + license = stdenv.lib.licenses.mpl20 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/librevenge/default.upstream b/pkgs/development/libraries/librevenge/default.upstream new file mode 100644 index 00000000000..48b678a392a --- /dev/null +++ b/pkgs/development/libraries/librevenge/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libwpd/files/librevenge/ +SF_version_dir librevenge- +version_link '[.]tar.xz/download$' +SF_redirect diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index b1277b87e6a..0dd99605b33 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -1,17 +1,26 @@ -{ stdenv, fetchurl, libogg, xz }: +{ stdenv, fetchurl, libogg, pkgconfig }: -stdenv.mkDerivation rec { - name = "libvorbis-1.3.3"; +let + name = "libvorbis-1.3.4"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz"; - sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43"; + sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g"; }; - nativeBuildInputs = [ xz ]; + buildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ libogg ]; - meta = { + doCheck = true; + + meta = with stdenv.lib; { homepage = http://xiph.org/vorbis/; + license = licenses.bsd3; + maintainers = [ maintainers.emery ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index 18f57473fb9..d69276a070b 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2 -, libICE, glib, libxkbfile, isocodes, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, xkeyboard_config, libxml2, xorg +, glib, isocodes, gobjectIntrospection }: let version = "5.3"; @@ -13,18 +13,22 @@ stdenv.mkDerivation rec { }; # TODO: enable xmodmap support, needs xmodmap DB - propagatedBuildInputs = [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; + propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gobjectIntrospection ]; - configureFlags = '' - --with-xkb-base=${xkeyboard_config}/etc/X11/xkb - --disable-xmodmap-support - ''; + configureFlags = [ + "--with-xkb-base=${xkeyboard_config}/etc/X11/xkb" + "--with-xkb-bin-base=${xorg.xkbcomp}/bin" + "--disable-xmodmap-support" + ]; - meta = { + meta = with stdenv.lib; { + description = "Library providing high-level API for X Keyboard Extension known as XKB"; homepage = http://freedesktop.org/wiki/Software/LibXklavier; + license = licenses.lgpl2Plus; }; } + diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index b235c746e1a..7e3ee3e9adc 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -4,8 +4,12 @@ assert pythonSupport -> python != null; #TODO: share most stuff between python and non-python builds, perhaps via multiple-output +let + version = "2.9.1"; +in + stdenv.mkDerivation (rec { - name = "libxml2-2.9.1"; + name = "libxml2-${version}"; src = fetchurl { url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz"; @@ -22,7 +26,7 @@ stdenv.mkDerivation (rec { setupHook = ./setup-hook.sh; - passthru = { inherit pythonSupport; }; + passthru = { inherit pythonSupport version; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 9088fa5fa62..4ffbb9719ca 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,13 +1,16 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, binutils }: stdenv.mkDerivation rec { - name = "lightning-1.2c"; + name = "lightning-2.0.4"; src = fetchurl { url = "ftp://alpha.gnu.org/gnu/lightning/${name}.tar.gz"; - sha256 = "00ss2b75msj4skkda9fs5df3bfpi8bwbckci8g0pwd3syppb3qdl"; + sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy"; }; + # Needs libopcodes.so from binutils for 'make check' + buildInputs = [ binutils ]; + doCheck = true; meta = { @@ -24,4 +27,4 @@ stdenv.mkDerivation rec { license = "LGPLv3+"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 8ff2cac539c..296744e1d56 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,15 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.8.1"; + version = "0.10.3"; name = "mdds-${version}"; src = fetchurl { - url = "http://multidimalgorithm.googlecode.com/files/mdds_${version}.tar.bz2"; - sha256 = "12w8rs8kb8yffndsw0g7qfjvy4gpnppkdzc7r7vvc9n800ixl1gn"; + url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2"; + sha256 = "1hp0472mcsgzrz1v60jpywxrrqmpb8bchfsi7ydmp6vypqnr646v"; }; + postInstall = '' + mkdir -p "$out/lib/pkgconfig" + cp "$out/share/pkgconfig/"* "$out/lib/pkgconfig" + ''; + meta = { + inherit version; homepage = https://code.google.com/p/multidimalgorithm/; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/mdds/default.upstream b/pkgs/development/libraries/mdds/default.upstream new file mode 100644 index 00000000000..5c07878fdf2 --- /dev/null +++ b/pkgs/development/libraries/mdds/default.upstream @@ -0,0 +1,10 @@ +url https://code.google.com/p/multidimalgorithm/wiki/Downloads +version_link '[.]tar[.][a-z0-9]+$' +version '.*_([0-9.]+)[.]tar[.].*' '\1' + +do_overwrite(){ + ensure_hash + ensure_version + set_var_value version $CURRENT_VERSION + set_var_value sha256 $CURRENT_HASH +} diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 1d21e03efa6..00d586a9f04 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,29 +1,39 @@ -{ stdenv, fetchurl, SDL, ffmpeg, libdv, libsamplerate, libvorbis -, libxml2 , pkgconfig, qt4, sox, gtk2 }: +{ stdenv, fetchurl, SDL, frei0r, jack2, libav, libdv, libsamplerate +, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox +}: stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { - url = "mirror://sourceforge/mlt/${name}.tar.gz"; - sha256 = "1j8wbkwpa6k5anyf4nvf71l8251d7clzj6v09jl3vvfakaf6l37j"; + url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; + sha256 = "0vk1i2yrny6dbip4aha25ibgv4m2rdhpxmz6a74q9wz1cgzbb766"; }; - buildInputs = - [ SDL ffmpeg libdv libsamplerate libvorbis libxml2 pkgconfig qt4 - sox # gtk2 /*optional*/ - ]; + buildInputs = [ + SDL frei0r jack2 libav libdv libsamplerate libvorbis libxml2 + makeWrapper movit pkgconfig qt sox + ]; # Mostly taken from: # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ "--enable-gpl" "--enable-gpl3" "--avformat-swscale" ]; + configureFlags = [ + "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--enable-opengl" + ]; enableParallelBuilding = true; - meta = { - homepage = http://www.mltframework.org/; + postInstall = '' + wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 + ''; + + meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - license = "GPLv3"; + homepage = http://www.mltframework.org/; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix new file mode 100644 index 00000000000..bfd474c88e7 --- /dev/null +++ b/pkgs/development/libraries/movit/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, SDL, eigen, epoxy, fftw, gtest, pkgconfig }: + +stdenv.mkDerivation rec { + name = "movit-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "http://movit.sesse.net/${name}.tar.gz"; + sha256 = "1k3qbkxapcplpsx22xh4m4ccp9fhsjfcj3pjzbcnrc51103aklag"; + }; + + GTEST_DIR = "${gtest}"; + + propagatedBuildInputs = [ eigen epoxy ]; + + buildInputs = [ SDL fftw gtest pkgconfig ]; + + meta = with stdenv.lib; { + description = "High-performance, high-quality video filters for the GPU"; + homepage = http://movits.sesse.net; + license = licenses.gpl2Plus; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 993993cecd0..7b502822a18 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -18,7 +18,13 @@ stdenv.mkDerivation (rec { sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"; }; - patches = [ ./patch-ac ]; + clangPatch = fetchurl { + # Patch referenced from https://github.com/Homebrew/homebrew-dupes/issues/43 + url = "http://lists.gnu.org/archive/html/bug-ncurses/2011-04/txtkWQqiQvcZe.txt"; + sha256 = "03lrwqvb0r2qgi8hz7ayd3g26d6xilr3c92j8li3b77kdc0w0rlv"; + }; + + patches = [ ./patch-ac ] ++ stdenv.lib.optional stdenv.isDarwin clangPatch; configureFlags = '' --with-shared --without-debug --enable-pc-files --enable-symlinks diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix new file mode 100644 index 00000000000..3b4f7da94f3 --- /dev/null +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, nix }: + +stdenv.mkDerivation { + name = "nix-plugins-1.0.0"; + + src = fetchgit { + url = git://github.com/shlevy/nix-plugins.git; + rev = "refs/tags/1.0.0"; + sha256 = "e624de55cabc9014e77f21978d657089ae94ce161584b3d9dc3c9763658421b3"; + }; + + buildInputs = [ nix ]; + + buildFlags = [ "NIX_INCLUDE=${nix}/include" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = { + description = "Collection of miscellaneous plugins for the nix expression language"; + homepage = https://github.com/shlevy/nix-plugins; + license = stdenv.lib.licenses.mit; + maintaners = [ stdenv.lib.maintainers.shlevy ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a8c12fe4856..447030f5fcc 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.16.1"; + version = "3.16.3"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_1_RTM/src/${name}.tar.gz"; - sha1 = "450a88dde8c7e4533507ac8340dbf94be28a759b"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_3_RTM/src/${name}.tar.gz"; + sha256 = "657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60"; }; buildInputs = [ nspr perl zlib sqlite ]; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix new file mode 100644 index 00000000000..852d72cb9aa --- /dev/null +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchsvn, cmake, libpng, ilmbase, libtiff, zlib, libjpeg +, mesa, libX11 +}: + +stdenv.mkDerivation rec { + # No support yet for cg, cuda, glew, glut, openexr. + + name = "nvidia-texture-tools"; + + src = fetchsvn { + url = "http://nvidia-texture-tools.googlecode.com/svn/trunk"; + rev = "1388"; + sha256 = "0pwxqx5l16nqidzm6mwd3rd4gbbknkz6q8cxnvf7sggjpbcvm2d6"; + }; + + buildInputs = [ cmake libpng ilmbase libtiff zlib libjpeg mesa libX11 ]; + + patchPhase = '' + # Fix build due to missing dependnecies. + echo 'target_link_libraries(bc7 nvmath)' >> src/nvtt/bc7/CMakeLists.txt + echo 'target_link_libraries(bc6h nvmath)' >> src/nvtt/bc6h/CMakeLists.txt + + # Make a recently added pure virtual function just virtual, + # to keep compatibility. + sed -i 's/virtual void endImage() = 0;/virtual void endImage() {}/' src/nvtt/nvtt.h + + # Fix building shared libraries. + sed -i 's/SET(NVIMAGE_SHARED TRUE)/SET(NVIMAGE_SHARED TRUE)\nSET(NVTHREAD_SHARED TRUE)/' CMakeLists.txt + ''; + + cmakeFlags = [ + "-DNVTT_SHARED=TRUE" + ]; + + meta = { + description = "A set of cuda-enabled texture tools and compressors"; + homepage = "http://developer.nvidia.com/object/texture_tools.html"; + license = "MIT"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/php-apc/default.nix b/pkgs/development/libraries/php-apc/default.nix deleted file mode 100644 index 7cfdc9ce30d..00000000000 --- a/pkgs/development/libraries/php-apc/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, fetchurl, php, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - name = "php-apc-3.1.7"; - - src = fetchurl { - url = http://pecl.php.net/get/APC-3.1.7.tgz; - sha256 = "0xlvhw5398sl5zzkjm4rkk1m3fcra30zkq0k4i6fij0ylpd6nlls"; - }; - - preConfigure = '' - phpize - - sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure - ''; - - configureFlags = [ "--enable-apc" "--enable-apc-mmap" ]; - - buildInputs = [ php autoconf automake libtool ]; - - meta = { - description = "Alternative PHP Cache"; - homepage = "http://pecl.php.net/package/APC"; - license = "PHP+"; - }; -} diff --git a/pkgs/development/libraries/php-xcache/default.nix b/pkgs/development/libraries/php-xcache/default.nix deleted file mode 100644 index 5f175aa72ff..00000000000 --- a/pkgs/development/libraries/php-xcache/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, php, autoconf, automake, libtool, m4 }: - -stdenv.mkDerivation rec { - name = "php-xcache-3.0.1"; - - src = fetchurl { - url = http://xcache.lighttpd.net/pub/Releases/3.0.1/xcache-3.0.1.tar.bz2; - md5 = "45086010bc4f82f506c08be1c556941b"; - }; - - preConfigure = '' - phpize - - sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure - ''; - - configureFlags = [ - "--enable-xcache" - "--enable-xcache-coverager" - "--enable-xcache-optimizer" - "--enable-xcache-assembler" - "--enable-xcache-encoder" - "--enable-xcache-decoder" - ]; - - buildInputs = [ php autoconf automake libtool m4 ]; - - meta = { - description = "Fast, stable PHP opcode cacher"; - homepage = http://xcache.lighttpd.net/; - license = "BSD"; - }; -} diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index f405e30433f..46d51281401 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { cp -r lib "$out" '' else '' make install + + # fixup .pc file to find alsa library + sed -i "s|-lasound|-L${alsaLib}/lib -lasound|" "$out/lib/pkgconfig/"*.pc ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index d33c7e0329f..e03f4ec88c7 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { patches = [ ./glib-2.32.patch (substituteAll { - src = ./dlopen-absolute-paths.patch; + src = ./qt-5.2-dlopen-absolute-paths.patch; inherit cups icu libXfixes; glibc = stdenv.gcc.libc; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; diff --git a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch index 3163e235d02..3163e235d02 100644 --- a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch +++ b/pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch diff --git a/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch new file mode 100644 index 00000000000..66cf342c107 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch @@ -0,0 +1,24 @@ +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 +@@ -103,7 +103,7 @@ + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } +diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +--- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 ++++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 +@@ -379,7 +379,7 @@ + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); +- QLibrary lib(QLatin1String("GL")); ++ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix new file mode 100644 index 00000000000..fdda7559d7a --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-5.3.nix @@ -0,0 +1,162 @@ +{ stdenv, fetchurl, substituteAll, libXrender, libXext +, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng +, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi +, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage +, xcbutilkeysyms, xcbutilwm,udev, libxml2, libxslt, pcre, libxkbcommon +, alsaLib, gstreamer, gst_plugins_base +, pulseaudio, bison, flex, gperf, ruby, libwebp +, flashplayerFix ? false +, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +, buildDocs ? false +, buildExamples ? false +, buildTests ? false +, developerBuild ? false +}: + +with stdenv.lib; + +let + v_maj = "5.3"; + v_min = "0"; + ver = "${v_maj}.${v_min}"; +in + +stdenv.mkDerivation rec { + name = "qt-${ver}"; + + src = fetchurl { + url = "http://download.qt-project.org/official_releases/qt/" + + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; + sha256 = "09gp19377zpqyfzk063b3pjz8gjm2x7xsj71bdpmnhs1scz0khcj"; + }; + + # The version property must be kept because it will be included into the QtSDK package name + version = ver; + + prePatch = '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace qtbase/configure --replace /bin/pwd pwd + substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf + ''; + + patches = + [ ./glib-2.32.patch + (substituteAll { + src = ./qt-5.3-dlopen-absolute-paths.patch; + inherit cups icu libXfixes; + glibc = stdenv.gcc.libc; + openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + }) + ] ++ optional gtkStyle (substituteAll { + src = ./dlopen-gtkstyle.patch; + # substituteAll ignores env vars starting with capital letter + gconf = GConf; + inherit gnome_vfs libgnomeui gtk; + }) + ++ optional flashplayerFix (substituteAll { + src = ./dlopen-webkit-nsplugin.patch; + inherit gtk gdk_pixbuf; + }); + + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + -c++11 + ${optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -system-proxies + + -gui + -widgets + -opengl desktop + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + -system-zlib + -system-libpng + -system-libjpeg + -system-xcb + -system-xkbcommon + -openssl-linked + -dbus-linked + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${optionalString (buildExamples == false) "no"}make examples + -${optionalString (buildTests == false) "no"}make tests + ''; + + propagatedBuildInputs = [ + xlibs.libXcomposite libX11 libxcb libXext libXrender libXi + fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre + zlib libjpeg libpng libtiff sqlite icu + libwebp alsaLib gstreamer gst_plugins_base pulseaudio + xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon + ] + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and + # doesn't remain a runtime-dep if not used + ++ optionals mesaSupported [ mesa mesa_glu ] + ++ optional (cups != null) cups + ++ optional (mysql != null) mysql + ++ optional (postgresql != null) postgresql; + + buildInputs = [ gdb bison flex gperf ruby ]; + + nativeBuildInputs = [ python perl pkgconfig ]; + + postInstall = + '' + ${optionalString buildDocs '' + make docs && make install_docs + ''} + + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri + ''; + + enableParallelBuilding = true; # often fails on Hydra, as well as qt4 + + meta = { + homepage = http://qt-project.org; + description = "A cross-platform application framework for C++"; + license = "GPL/LGPL"; + maintainers = [ maintainers.bbenoist maintainers.qknight ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix new file mode 100644 index 00000000000..1f9c92dbbb8 --- /dev/null +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -0,0 +1,34 @@ +{ fetchurl, stdenv, ant, jdk, python }: + +stdenv.mkDerivation rec { + name = "rabbitmq-java-client-3.3.4"; + + src = fetchurl { + url = "http://www.rabbitmq.com/releases/rabbitmq-java-client/v3.3.4/rabbitmq-java-client-3.3.4.tar.gz"; + sha256 = "03kspkgzzjsbq6f8yl2zj5m30qwgxv3l58hrbf6gcgxb5rpfk6sh"; + }; + + buildInputs = [ ant jdk python ]; + + buildPhase = "ant dist"; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp build/lib/*.jar lib/*.jar $out/lib/ + + # There is a script in the source archive, but ours is cleaner + cat > "$out/bin/PerfTest" <<EOF + #!${stdenv.shell} + java_exec_args="-Djava.awt.headless=true" + exec ${jdk.jre}/bin/java \$java_exec_args -classpath "$out/lib/*" com.rabbitmq.examples.PerfTest "\$@" + EOF + chmod a+x $out/bin/PerfTest + ''; + + meta = with stdenv.lib; { + description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; + homepage = http://www.rabbitmq.com/java-client.html; + license = [ "MPLv1.1" "GPLv2" ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix new file mode 100644 index 00000000000..bc30716e81f --- /dev/null +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, openssl, tcl, readline ? null, ncurses ? null }: + +assert readline != null -> ncurses != null; + +stdenv.mkDerivation { + name = "sqlcipher-3.1.0"; + + src = fetchurl { + url = "https://github.com/sqlcipher/sqlcipher/archive/v3.1.0.tar.gz"; + sha256 = "1h54hsl7g6ra955aaqid5wxm93fklx2pxz8abcdwf9md3bpfcn18"; + }; + + buildInputs = [ readline ncurses openssl tcl ]; + + configureFlags = "--enable-threadsafe --disable-tcl"; + + CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_HAS_CODEC"; + LDFLAGS = if readline != null then "-lncurses" else ""; + + meta = { + homepage = http://sqlcipher.net/; + description = "Full Database Encryption for SQLite"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 38cde3bfd70..17f9c973fd0 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -1,9 +1,17 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "szip-2.1"; - src = fetchurl { - url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; - sha256 = "05707lrdhwp8mv0dgzh2b6m2mwamv1z6k29m2v1v7pz0c1w2gb6z"; - }; -} \ No newline at end of file + name = "szip-2.1"; + src = fetchurl { + url = ftp://ftp.hdfgroup.org/lib-external/szip/2.1/src/szip-2.1.tar.gz; + sha256 = "1vym7r4by02m0yqj10023xyps5b21ryymnxb4nb2gs32arfxj5m8"; + }; + + meta = { + description = " + Szip is a compression library that can be used with the hdf5 library. + "; + homepage = http://www.hdfgroup.org/doc_resource/SZIP/; + license = stdenv.lib.licenses.unfree; + }; +} diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 92fbe81a32e..3ef43baca5e 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { + description = "A service which logs the users's activities and events"; homepage = https://launchpad.net/zeitgeist; - description = "Zeitgeist is a service which logs the users's activities and events"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 088eb1b9493..0938e2a17a7 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # As zlib takes part in the stdenv building, we don't want references # to the bootstrap-tools libgcc (as uses to happen on arm/mips) - NIX_CFLAGS_COMPILE = "-static-libgcc"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc"; crossAttrs = { dontStrip = static; @@ -44,4 +44,9 @@ stdenv.mkDerivation rec { cygwinConfigureEnableShared = true; passthru.version = version; + + meta = with stdenv.lib; { + description = "Lossless data-compression library"; + license = licenses.zlib; + }; } diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 055a491f460..dcfaafc2b7d 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Zziplib, a library to extract data from files archived in a zip file"; + description = "Library to extract data from files archived in a zip file"; longDescription = '' The zziplib library is intentionally lightweight, it offers the ability diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index f7d6dd2676d..14c996fa05a 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -37,7 +37,7 @@ let lispPackages = rec { src = pkgs.fetchdarcs { url = "http://common-lisp.net/project/iterate/darcs/iterate"; sha256 = "0m3q0s7h5s8varwx584m2akgdslj14df7kg4w1bj1fbgzsag5m1w"; - tag=version; + rev = version; }; overrides = x: { configurePhase="buildPhase(){ true; }"; diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index 1e32cce9c72..2443bfe9aed 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --password ${androidKeyStorePassword} --output-dir $out'' else - ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only --output $out''} + ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''} '' else if target == "iphone" then '' @@ -67,7 +67,7 @@ stdenv.mkDerivation { security unlock-keychain -p "" $keychainName security import ${iosCertificate} -k $keychainName -P "${iosCertificatePassword}" -A - provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Z0-9]\{36\}") + provisioningId=$(grep UUID -A1 -a ${iosMobileProvisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") # Ensure that the requested provisioning profile can be found diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 18b76bc3bbd..6c71116b5e8 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.1.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "5.0", tiVersion ? "3.2.3.GA"}: let # We have to use Oracle's JDK. On Darwin, just simply expose the host system's @@ -29,7 +29,8 @@ rec { titaniumsdk = let titaniumSdkFile = if tiVersion == "3.1.4.GA" then ./titaniumsdk-3.1.nix - else if tiVersion == "3.2.2.GA" then ./titaniumsdk-3.2.nix + else if tiVersion == "3.2.3.GA" then ./titaniumsdk-3.2.nix + else if tiVersion == "3.3.0.GA" then ./titaniumsdk-3.3.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 556b96975b4..e5b43936453 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -1,7 +1,7 @@ { nixpkgs ? <nixpkgs> , systems ? [ "x86_64-linux" "x86_64-darwin" ] , xcodeVersion ? "5.0" -, tiVersion ? "3.2.2.GA" +, tiVersion ? "3.2.3.GA" , rename ? false , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "" , allowUnfree ? false diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index 95dd09be30d..1725c826a52 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -1,4 +1,4 @@ -{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "11" ], tiVersion ? "3.2.1.GA", release ? false +{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "14" ], tiVersion ? "3.2.3.GA", release ? false , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null }: @@ -7,8 +7,8 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; - rev = "0b8175f20f0aa71f93921025dec5d0f3299960ae"; - sha256 = "0b2p4wbnlp46wpanqj5h3yfb2hdbh20nxbis8zscj4qlgrnyjdjz"; + rev = "37d766ef9cba6a2d0b22634d3edc1fa8402109a0"; + sha256 = "1d4x9zwq92p1krds52bd41qqsnsnb3a7x74bysbiphrvrphz80kk"; }; # Rename the bundle id to something else diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix index 1f0d53e99fe..2ac4040714b 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix @@ -1,14 +1,14 @@ {stdenv, fetchurl, unzip, makeWrapper, python, jdk}: stdenv.mkDerivation { - name = "mobilesdk-3.2.2.v20140305122111"; + name = "mobilesdk-3.2.3.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-linux.zip; - sha1 = "12dc1bfe8dd73db0650a235492f5f50c7b816d69"; + url = http://builds.appcelerator.com/mobile/3.2.3/mobilesdk-3.2.3.GA-linux.zip; + sha1 = "303e6d19a0ca099d47f6862c00b261c6d0206cea"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = http://builds.appcelerator.com.s3.amazonaws.com/mobile/3_2_X/mobilesdk-3.2.2.v20140305122111-osx.zip; - sha1 = "9875b59faf0ab92e8996b58476466405ed60f6e2"; + url = http://builds.appcelerator.com/mobile/3.2.3/mobilesdk-3.2.3.GA-osx.zip; + sha1 = "8c358cbd8624ffe3dfbd0283738105157067e0fb"; } else throw "Platform: ${stdenv.system} not supported!"; @@ -28,8 +28,7 @@ stdenv.mkDerivation { # Rename ugly version number cd mobilesdk/* - mv 3.2.2.v20140305122111 3.2.2.GA - cd 3.2.2.GA + cd 3.2.3.GA # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that # Yes, I know it's nasty :-) diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix new file mode 100644 index 00000000000..be3628f2644 --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix @@ -0,0 +1,77 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-3.3.0.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-linux.zip; + sha1 = "9a9cca05a4cf8700df60b7e9d9cd969ecb70d81e"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/3.3.0/mobilesdk-3.3.0.GA-osx.zip; + sha1 = "c6333e4da2564b9c51b865c1db49a062fbc743af"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + yes y | unzip $src + + # Fix shebang header for python scripts + + find . -name \*.py | while read i + do + sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i + done + + # Rename ugly version number + cd mobilesdk/* + cd 3.3.0.GA + + # Zip files do not support timestamps lower than 1980. We have to apply a few work-arounds to cope with that + # Yes, I know it's nasty :-) + + cd android + + sed -i -f ${./fixtiverify.sed} builder.py + sed -i -f ${./fixtiprofiler.sed} builder.py + sed -i -f ${./fixso.sed} builder.py + sed -i -f ${./fixnativelibs.sed} builder.py + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + '' + else ""} + + # Wrap builder script + + mv builder.py .builder.py + cat > builder.py <<EOF + #!${python}/bin/python + + import os, sys + + os.environ['PYTHONPATH'] = '$(echo ${python.modules.sqlite3}/lib/python*/site-packages)' + os.environ['JAVA_HOME'] = '${if stdenv.system == "x86_64-darwin" then jdk else "${jdk}/lib/openjdk"}' + + os.execv('$(pwd)/.builder.py', sys.argv) + EOF + + chmod +x builder.py + + '' + stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") '' + # 'ditto' utility is needed to copy stuff to the Xcode organizer. Dirty, but this allows it to work. + sed -i -e "s|ditto|/usr/bin/ditto|g" $out/mobilesdk/osx/*/iphone/builder.py + + sed -i -e "s|--xcode|--xcode '+process.env['NIX_TITANIUM_WORKAROUND']+'|" $out/mobilesdk/osx/*/iphone/cli/commands/_build.js + ''; +} diff --git a/pkgs/development/mobile/xcodeenv/build-app.nix b/pkgs/development/mobile/xcodeenv/build-app.nix index ade629759f0..b5766c80552 100644 --- a/pkgs/development/mobile/xcodeenv/build-app.nix +++ b/pkgs/development/mobile/xcodeenv/build-app.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { security import ${certificateFile} -k $keychainName -P "${certificatePassword}" -A # Determine provisioning ID - PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Z0-9]\{36\}") + PROVISIONING_PROFILE=$(grep UUID -A1 -a ${provisioningProfile} | grep -o "[-A-Za-z0-9]\{36\}") if [ ! -f "$HOME/Library/MobileDevice/Provisioning Profiles/$PROVISIONING_PROFILE.mobileprovision" ] then diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix new file mode 100644 index 00000000000..59f30de5e84 --- /dev/null +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, ocaml, findlib, easy-format}: +let + pname = "biniou"; + version = "1.0.9"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "14j3hrhbjqxbizr1pr8fcig9dmfzhbjjwzwyc99fcsdic67w8izb"; + }; + + buildInputs = [ ocaml findlib easy-format ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = { + description = "A binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix new file mode 100644 index 00000000000..d01a4edf26e --- /dev/null +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "easy-format"; + version = "1.0.2"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "07wlgprqvk92z0p2xzbnvh312ca6gvhy3xc6hxlqfawnnnin7rzi"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + meta = { + description = "A high-level and functional interface to the Format module of the OCaml standard library"; + homepage = "${webpage}"; + license = "bsd"; + }; +} + + diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix new file mode 100644 index 00000000000..9237db080d6 --- /dev/null +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchurl, ocaml, findlib, cppo, easy-format, biniou}: +let + pname = "yojson"; + version = "1.1.8"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv"; + }; + + buildInputs = [ ocaml findlib cppo easy-format biniou ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = { + description = "An optimized parsing and printing library for the JSON format"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix index 9f900e4f50a..94eec40d51f 100644 --- a/pkgs/development/python-modules/4suite/default.nix +++ b/pkgs/development/python-modules/4suite/default.nix @@ -10,4 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [python]; buildPhase = "true"; installPhase = "python ./setup.py install --prefix=$out"; + + # None of the tools installed to bin/ work. They all throw an exception + # similar to this: + # ImportError: No module named Ft.Xml.XPath._4xpath + meta.broken = true; } diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 282aeca9ed1..dda9f4877f6 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,6 +26,7 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." + sed -i "$i" -e "/^#\!/a import sys; sys.argv[0] = '$(basename $i)'" wrapProgram "$i" \ --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix new file mode 100644 index 00000000000..d4461788381 --- /dev/null +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages }: + +buildPythonPackage rec { + name = "mygpoclient-1.7"; + + src = fetchurl { + url = "https://thp.io/2010/mygpoclient/${name}.tar.gz"; + sha256 = "6a0b7b1fe2b046875456e14eda3e42430e493bf2251a64481cf4fd1a1e21a80e"; + }; + + buildInputs = [ pythonPackages.nose pythonPackages.minimock ]; + + checkPhase = "make test"; + + meta = { + description = "A gpodder.net client library"; + longDescription = '' + The mygpoclient library allows developers to utilize a Pythonic interface + to the gpodder.net web services. + ''; + homepage = "https://thp.io/2010/mygpoclient/"; + license = "GPLv3"; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.skeidel ]; + }; +} diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix new file mode 100644 index 00000000000..7c897e9531f --- /dev/null +++ b/pkgs/development/python-modules/tables/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, python, buildPythonPackage +, cython, bzip2, lzo, numpy, numexpr, hdf5 }: + +buildPythonPackage rec { + version = "3.1.1"; + name = "tables-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/pytables/${name}.tar.gz"; + sha256 = "18rdzv9xwiapb5c8y47rk2fi3fdm2dpjf68wfycma67ifrih7f9r"; + }; + + buildInputs = [ hdf5 cython bzip2 lzo ]; + propagatedBuildInputs = [ numpy numexpr ]; + + # The setup script complains about missing run-paths, but they are + # actually set. + setupPyBuildFlags = + [ "--hdf5=${hdf5}" + "--lzo=${lzo}" + "--bzip2=${bzip2}" + ]; + setupPyInstallFlags = setupPyBuildFlags; + + # Run the test suite. + # It requires the build path to be in the python search path. + # These tests take quite some time. + # If the hdf5 library is built with zlib then there is only one + # test-failure. That is the same failure as described in the following + # github issue: + # https://github.com/PyTables/PyTables/issues/269 + checkPhase = '' + ${python}/bin/${python.executable} <<EOF + import sysconfig + import sys + import os + f = "lib.{platform}-{version[0]}.{version[1]}" + lib = f.format(platform=sysconfig.get_platform(), + version=sys.version_info) + build = os.path.join(os.getcwd(), 'build', lib) + sys.path.insert(0, build) + import tables + r = tables.test() + if not r.wasSuccessful(): + sys.exit(1) + EOF + ''; + + # Disable tests until the failure described above is fixed. + doCheck = false; + + meta = { + description = "Hierarchical datasets for Python"; + homepage = "http://www.pytables.org/"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 3bebd5468e9..3a8624c9493 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -44,7 +44,10 @@ let derive = { name, version, sha256, depends ? [] }: buildRPackage { name = "${name}-${version}"; src = fetchurl { - url = "mirror://cran/src/contrib/${name}_${version}.tar.gz"; + urls = [ + "mirror://cran/src/contrib/${name}_${version}.tar.gz" + "mirror://cran/src/contrib/Archive/${name}/${name}_${version}.tar.gz" + ]; inherit sha256; }; propagatedBuildInputs = depends; diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 500cef43bcb..ca4176dbe1e 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.64"; + version = "1.65"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "0n2hrg99rsp77b3plpip315pyk0x4gh8gljs9z3iwcbcg14mliff"; + sha256 = "0rsxnqvjyiviqsq4y5x4p1jpvcmhf8hh7d710rsvnv5d4cj7lmqn"; }; configurePhase = '' diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index f860f05c36a..6d0e28f0ab2 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -1,38 +1,25 @@ -{ fetchurl, stdenv, pkgconfig }: +{ fetchurl, stdenv, pkgconfig, libxml2, llvm }: stdenv.mkDerivation rec { - name = "sparse-0.4.4"; + name = "sparse-0.5.0"; src = fetchurl { - url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.gz"; - sha256 = "5ad02110130fd8f8d82f2b030de5f2db6f924fd805593a5b8be8072a620414c6"; + url = "mirror://kernel/software/devel/sparse/dist/${name}.tar.xz"; + sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj"; }; preConfigure = '' - sed -i "Makefile" \ - -e "s|^PREFIX *=.*$|PREFIX = $out|g" + sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" ''; - buildInputs = [ pkgconfig ]; - + buildInputs = [ pkgconfig libxml2 llvm ]; doCheck = true; meta = { description = "Sparse, a semantic parser for C"; - - longDescription = '' - Sparse, the semantic parser, provides a compiler frontend - capable of parsing most of ANSI C as well as many GCC - extensions, and a collection of sample compiler backends, - including a static analyzer also called "sparse". Sparse - provides a set of annotations designed to convey semantic - information about types, such as what address space pointers - point to, or what locks a function acquires or releases. - ''; - - homepage = http://www.kernel.org/pub/software/devel/sparse/; - - # See http://www.opensource.org/licenses/osl.php . - license = "Open Software License v1.1"; + homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; } diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 4be166f9768..06c04ca41b5 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -1,26 +1,20 @@ -{stdenv, fetchurl, flex, yacc, tk }: +{stdenv, fetchurl, yacc }: -stdenv.mkDerivation { - name = "spin-5.1.7"; +stdenv.mkDerivation rec { + version = "6.3.2"; + name = "spin-${version}"; src = fetchurl { - url = http://spinroot.com/spin/Src/spin517.tar.gz; - sha256 = "03c6bmar4z13jx7dddb029f0qnmgl8x4hyfwn3qijjyd4dbliiw6"; + url = http://spinroot.com/spin/Src/spin632.tar.gz; + curlOpts = "--user-agent 'Mozilla/5.0'"; + sha256 = "1llsv1mnwr99hvsm052i3wwpa3dm5j12s5p10hizi6i9hlp00b5y"; }; - buildInputs = [ flex yacc tk ]; + buildInputs = [ yacc ]; - patchPhase = '' - cd Src* - sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile - ''; - installPhase = '' - mkdir -p $out/bin - cp ../Xspin*/xsp* $out/bin/xspin - sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \ - -e '/exec wish/d' $out/bin/xspin - cp spin $out/bin - ''; + sourceRoot = "Spin/Src${version}"; + + installPhase = "install -D spin $out/bin/spin"; meta = { description = "Formal verification tool for distributed software systems"; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c4ea8183af..99353a1a192 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.4.0"; + version = "2.4.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0mdfp5r5qid42x7rq1cmyxqmvjdj2hk9rjz8pryf4zq3bk38m1cg"; + sha256 = "1qdq3v7wv9jacw4bipgx24knlipw6zdcx43yd1qyw6zwaad51ckw"; }; jarsrc = fetchurl { url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.jar"; - sha256 = "099r5qcldb214c3857i7dbbqn531aahzrz39qfhqxc6f476ncdh0"; + sha256 = "0n4kpmzw9nvppq758lhnrr7xps5j6gwmdm98m772cj7j4vixsrzb"; }; patches = [ ./lein-fix-jar-path.patch ]; diff --git a/pkgs/development/tools/documentation/haddock/2.10.0.nix b/pkgs/development/tools/documentation/haddock/2.10.0.nix index cfda3b66704..d3e48c619fa 100644 --- a/pkgs/development/tools/documentation/haddock/2.10.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.10.0.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.11.0.nix b/pkgs/development/tools/documentation/haddock/2.11.0.nix index 968efe2260b..6a2cf668682 100644 --- a/pkgs/development/tools/documentation/haddock/2.11.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.11.0.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "0a29n6y9lmk5w78f6j8s7pg0m0k3wm7bx5r2lhk7bnzkr5f7rkcd"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal filepath ghcPaths xhtml ]; + buildDepends = [ Cabal filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.12.0.nix b/pkgs/development/tools/documentation/haddock/2.12.0.nix index 12907a64d21..6d3f333962b 100644 --- a/pkgs/development/tools/documentation/haddock/2.12.0.nix +++ b/pkgs/development/tools/documentation/haddock/2.12.0.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix index 3cac6e13323..89a488fdd31 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.1.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.1.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "0kpk3bmlyd7cb6s39ix8s0ak65xhrln9mg481y3h24lf5syy5ky9"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.13.2.nix b/pkgs/development/tools/documentation/haddock/2.13.2.nix index 95890f5bd43..6227f55888b 100644 --- a/pkgs/development/tools/documentation/haddock/2.13.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.13.2.nix @@ -1,4 +1,4 @@ -{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml }: +{ cabal, alex, Cabal, deepseq, filepath, ghcPaths, happy, xhtml, makeWrapper }: cabal.mkDerivation (self: { pname = "haddock"; @@ -6,10 +6,15 @@ cabal.mkDerivation (self: { sha256 = "1qwj13ks3fzar14s587svv1pdiwk80m7x5pzn74v3jrqkn0xbrr5"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath ]; buildTools = [ alex happy ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.14.2.nix b/pkgs/development/tools/documentation/haddock/2.14.2.nix index af611de4b9f..8838b6def42 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.2.nix @@ -1,5 +1,5 @@ { cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck -, xhtml +, xhtml, makeWrapper }: cabal.mkDerivation (self: { @@ -8,9 +8,14 @@ cabal.mkDerivation (self: { sha256 = "0h96jj6y093h4gcqpiq0nyv7h5wjg8ji7z1im9ydivmsv0627prk"; isLibrary = true; isExecutable = true; - buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml makeWrapper ]; testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; doCheck = false; + + postInstall = '' + wrapProgram $out/bin/haddock --add-flags "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"--optghc=-package-conf --optghc=\")" + ''; + meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix new file mode 100644 index 00000000000..2ee55bebd01 --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, deepseq, filepath, ghcPaths, hspec, QuickCheck +, xhtml +}: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.14.3"; + sha256 = "031ikrsbkpmmwgdkgdr8s19dfx5y6n39rmyljjdfqygas17gcm6l"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; + testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; + doCheck = false; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/2.4.2.nix b/pkgs/development/tools/documentation/haddock/2.4.2.nix index 811ffd2855d..34af47f48db 100644 --- a/pkgs/development/tools/documentation/haddock/2.4.2.nix +++ b/pkgs/development/tools/documentation/haddock/2.4.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, Cabal, filepath, ghcPaths, happy }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/documentation/haddock/2.9.4.nix b/pkgs/development/tools/documentation/haddock/2.9.4.nix index 8a57dd851c2..dc7ab7f968b 100644 --- a/pkgs/development/tools/documentation/haddock/2.9.4.nix +++ b/pkgs/development/tools/documentation/haddock/2.9.4.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alex, Cabal, filepath, ghcPaths, happy, regexCompat, xhtml }: diff --git a/pkgs/development/tools/etcdctl/default.nix b/pkgs/development/tools/etcdctl/default.nix new file mode 100644 index 00000000000..a37ef26f541 --- /dev/null +++ b/pkgs/development/tools/etcdctl/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "etcdctl-${version}"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o etcdctl github.com/coreos/etcdctl + ''; + + installPhase = '' + ensureDir $out/bin + mv etcdctl $out/bin + ''; + + meta = with stdenv.lib; { + description = "A simple command line client for etcd"; + homepage = http://coreos.com/using-coreos/etcd/; + license = licenses.asl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/etcdctl/deps.nix b/pkgs/development/tools/etcdctl/deps.nix new file mode 100644 index 00000000000..98bdda95a43 --- /dev/null +++ b/pkgs/development/tools/etcdctl/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/coreos/etcdctl"; + src = fetchFromGitHub { + owner = "coreos"; + repo = "etcdctl"; + rev = "061135b2a02797a6b3c2b6c01183517c1bc76a2c"; + sha256 = "1hl9cz9ygr2k4d67qj9q1xj0n64b28qjy5sv7zylgg9h9ag2j2p4"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/exercism/default.nix b/pkgs/development/tools/exercism/default.nix new file mode 100644 index 00000000000..6c909382522 --- /dev/null +++ b/pkgs/development/tools/exercism/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "exercism-${version}"; + + version = "1.6.2"; + + src = + if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-darwin-amd64.tgz"; + sha256 = "1w9jw52nhb5mlcj6ampzwjscdr9rja5mdn5ga2r4z2qzsqzwkpm2"; + } + else if stdenv.system == "i686-darwin" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v${version}/exercism-darwin-386.tgz"; + sha256 = "1g5cy53mrdzq047b8hlkjrkc4bp7yhipvhf4lnw0x2jr50z73bzd"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v1.6.2/exercism-linux-386.tgz"; + sha256 = "1akdggla9kn7v4dwkyz63bp84dihcgyph546zskiyh9bz67l5liz"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/exercism/cli/releases/download/v1.6.2/exercism-linux-amd64.tgz"; + sha256 = "00kp0r9xy9bw9b2854csy35pk9sxvbivxmwiy97wl9gh0acva5ng"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildPhase = ""; + + setSourceRoot = "sourceRoot=./"; + + installPhase = '' + mkdir -p $out/bin + cp -a exercism $out/bin + ''; + + meta = { + description = "A Go based command line tool for exercism.io"; + homepage = http://exercism.io; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.wjlroe ]; + }; +} diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix new file mode 100644 index 00000000000..6057c288cf6 --- /dev/null +++ b/pkgs/development/tools/gocode/default.nix @@ -0,0 +1,29 @@ +{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "gocode"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ go ]; + + buildPhase = '' + export GOPATH=$src + go build -v -o gocode github.com/nsf/gocode + ''; + + installPhase = '' + ensureDir $out/bin + mv gocode $out/bin + ''; + + meta = with lib; { + description = "An autocompletion daemon for the Go programming language"; + homepage = https://github.com/nsf/gocode; + license = licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix new file mode 100644 index 00000000000..4fd0578496d --- /dev/null +++ b/pkgs/development/tools/gocode/deps.nix @@ -0,0 +1,27 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/nsf/gocode"; + src = fetchFromGitHub { + owner = "nsf"; + repo = "gocode"; + rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78"; + sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index d39544342b3..3017bc7c7b9 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, alexMeta, happyMeta, haskellSrcMeta, syb }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/DrIFT/default.nix b/pkgs/development/tools/haskell/DrIFT/default.nix index f0ae57b6287..6f0f8fb0c60 100644 --- a/pkgs/development/tools/haskell/DrIFT/default.nix +++ b/pkgs/development/tools/haskell/DrIFT/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, random }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/HaRe/default.nix b/pkgs/development/tools/haskell/HaRe/default.nix index 0bcb19968ba..c6459b0e7f2 100644 --- a/pkgs/development/tools/haskell/HaRe/default.nix +++ b/pkgs/development/tools/haskell/HaRe/default.nix @@ -1,26 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, deepseq, Diff, dualTree, filepath, ghcMod, ghcPaths -, ghcSybUtils, hslogger, hspec, HUnit, monoidExtras, mtl, parsec -, QuickCheck, rosezipper, semigroups, silently -, StrafunskiStrategyLib, stringbuilder, syb, syz, time +, ghcSybUtils, haskellTokenUtils, hslogger, hspec, HUnit +, monoidExtras, mtl, parsec, QuickCheck, rosezipper, semigroups +, silently, StrafunskiStrategyLib, stringbuilder, syb, syz, time , transformers }: cabal.mkDerivation (self: { pname = "HaRe"; - version = "0.7.2.3"; - sha256 = "1zhwi568asgwvsbqrcglwa6jmbm85m3fi94mklb40ib149k4il1s"; + version = "0.7.2.6"; + sha256 = "0fvnif75sjgi4388in8fdvgvaxb0s9cgnqf7i583rxlxjibx44ai"; isLibrary = true; isExecutable = true; buildDepends = [ - dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger monoidExtras - mtl parsec rosezipper semigroups StrafunskiStrategyLib syb syz time - transformers + dualTree filepath ghcMod ghcPaths ghcSybUtils haskellTokenUtils + hslogger monoidExtras mtl parsec rosezipper semigroups + StrafunskiStrategyLib syb syz time transformers ]; testDepends = [ - deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils hslogger - hspec HUnit monoidExtras mtl QuickCheck rosezipper semigroups - silently StrafunskiStrategyLib stringbuilder syb syz time - transformers + deepseq Diff dualTree filepath ghcMod ghcPaths ghcSybUtils + haskellTokenUtils hslogger hspec HUnit monoidExtras mtl QuickCheck + rosezipper semigroups silently StrafunskiStrategyLib stringbuilder + syb syz time transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index 5bb298e739a..a8c2840923b 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcMeta, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index ee1fc152f80..44d4bcd8340 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -1,11 +1,13 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, cabalLenses, cmdargs, either, filepath, lens , strict, tasty, tastyGolden, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.6"; - sha256 = "0dl8rf8y365a20yz5kk1c9y860k5mkg1jp5dipvbf451h7a7h9w5"; + version = "0.7"; + sha256 = "1dz3bi33s2s0glsw248dxh76yj6qqlq2v2z7rys5js1mi6dicwa3"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix index 0d8b6ce5993..234c158cf90 100644 --- a/pkgs/development/tools/haskell/cabal-db/default.nix +++ b/pkgs/development/tools/haskell/cabal-db/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, ansiWlPprint, Cabal, filepath, mtl, optparseApplicative , tar, utf8String }: diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix index dee25727384..2fc2637840d 100644 --- a/pkgs/development/tools/haskell/cabal-ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/cabal-meta/default.nix b/pkgs/development/tools/haskell/cabal-meta/default.nix index 7aec5022720..9dc0a4fb9af 100644 --- a/pkgs/development/tools/haskell/cabal-meta/default.nix +++ b/pkgs/development/tools/haskell/cabal-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, hspec, shelly, systemFileio, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/cabal2ghci/default.nix b/pkgs/development/tools/haskell/cabal2ghci/default.nix index f8adaee4671..deb9e8d18d9 100644 --- a/pkgs/development/tools/haskell/cabal2ghci/default.nix +++ b/pkgs/development/tools/haskell/cabal2ghci/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, cmdargs, stylishHaskell, systemFileio , systemFilepath, text, unorderedContainers, yaml }: diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 2201040efe1..04e9f1cfea1 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,10 +1,12 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix }: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.63"; - sha256 = "12frnhm86w5i6rmhghrdngdv658332bh9j5nr04ql439yysvkypj"; + version = "1.66"; + sha256 = "1is72jfv6snz59jpmg7dfcinpi3q4kdiqchd7zf45rqrszd5h43p"; isLibrary = false; isExecutable = true; buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; diff --git a/pkgs/development/tools/haskell/cake3/default.nix b/pkgs/development/tools/haskell/cake3/default.nix index f7b678ad9fb..5b948f510bf 100644 --- a/pkgs/development/tools/haskell/cake3/default.nix +++ b/pkgs/development/tools/haskell/cake3/default.nix @@ -1,18 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, attoparsec, deepseq, filepath, haskellSrcMeta , languageJavascript, mimeTypes, monadloc, mtl, optparseApplicative -, syb, systemFilepath, text, textFormat +, parsec, syb, systemFilepath, text, textFormat }: cabal.mkDerivation (self: { pname = "cake3"; - version = "0.5.0.0"; - sha256 = "0hfnda0xp8saav85pgqmcb6ib699gm6gy5f087nlrx7058f4n7ji"; + version = "0.5.1.0"; + sha256 = "0kqx8xr0ynbn7fhfz11is7lbi32dfladsx32bcpspykqj1bjv954"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec deepseq filepath haskellSrcMeta languageJavascript - mimeTypes monadloc mtl optparseApplicative syb systemFilepath text - textFormat + mimeTypes monadloc mtl optparseApplicative parsec syb + systemFilepath text textFormat ]; meta = { homepage = "https://github.com/grwlf/cake3"; diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index 3bc9959c8d7..fac145b14c2 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -1,17 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, downloadCurl, either, filepath, hackageDb, MissingH , monadLoops, tar, text, transformers, yaml, zlib }: cabal.mkDerivation (self: { pname = "codex"; - version = "0.0.2.1"; - sha256 = "0cwn44dw3fks1qaymrjn3q99lq6baginh12y6wwkhz53cd6cv41z"; + version = "0.1.0.3"; + sha256 = "0sbkri6y9f4wws120kbb93sv1z0z75hjw9pw5r3wadmmd0lygsn9"; isLibrary = true; isExecutable = true; buildDepends = [ Cabal downloadCurl either filepath hackageDb MissingH monadLoops tar text transformers yaml zlib ]; + jailbreak = true; meta = { homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix index 7744a3071cc..af708e40afe 100644 --- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, diagramsLib, diagramsSvg, filepath, ghcEvents, lens, mtl , optparseApplicative, parsec, SVGFonts, thLift, transformers }: diff --git a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix index 193d12fdefa..e5517854c34 100644 --- a/pkgs/development/tools/haskell/ghc-gc-tune/default.nix +++ b/pkgs/development/tools/haskell/ghc-gc-tune/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index a3d885c6008..e7c143d7ace 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, haskellSrcMeta, mtl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/haskdogs/default.nix b/pkgs/development/tools/haskell/haskdogs/default.nix index c05368c3980..06a6b04bb59 100644 --- a/pkgs/development/tools/haskell/haskdogs/default.nix +++ b/pkgs/development/tools/haskell/haskdogs/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, HSH }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/hasktags/default.nix b/pkgs/development/tools/haskell/hasktags/default.nix index 8942a1b79c2..36b3739a140 100644 --- a/pkgs/development/tools/haskell/hasktags/default.nix +++ b/pkgs/development/tools/haskell/hasktags/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, json, utf8String }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 69e880176a3..21825e787a0 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -1,18 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, cpphs, filepath, haskellSrcExts, hscolour , transformers, uniplate }: cabal.mkDerivation (self: { pname = "hlint"; - version = "1.8.61"; - sha256 = "08y8ny6dv14gxnzzr5f1hvs22m7y62yffyq2pzvw2aja8fbj5d2z"; + version = "1.9.2"; + sha256 = "1pbcd4rzavhca3vydynasi3lk36pz948mqxp58rlb2j5dan9sw78"; isLibrary = true; isExecutable = true; buildDepends = [ cmdargs cpphs filepath haskellSrcExts hscolour transformers uniplate ]; - jailbreak = true; meta = { homepage = "http://community.haskell.org/~ndm/hlint/"; description = "Source code suggestions"; diff --git a/pkgs/development/tools/haskell/hobbes/default.nix b/pkgs/development/tools/haskell/hobbes/default.nix index 0c9b2d45ae1..a9b48f922c8 100644 --- a/pkgs/development/tools/haskell/hobbes/default.nix +++ b/pkgs/development/tools/haskell/hobbes/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filemanip, filepath, fsnotify, systemFilepath, text }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/hp2any-manager/default.nix b/pkgs/development/tools/haskell/hp2any-manager/default.nix index 2189d52f707..3bbf65bcf7a 100644 --- a/pkgs/development/tools/haskell/hp2any-manager/default.nix +++ b/pkgs/development/tools/haskell/hp2any-manager/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cairo, filepath, glade, glib, gtk, gtkglext, hp2anyCore , hp2anyGraph, OpenGL, time }: diff --git a/pkgs/development/tools/haskell/hscolour/default.nix b/pkgs/development/tools/haskell/hscolour/default.nix index d8bc08b4b33..fa41d7fb35c 100644 --- a/pkgs/development/tools/haskell/hscolour/default.nix +++ b/pkgs/development/tools/haskell/hscolour/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/hslogger/default.nix b/pkgs/development/tools/haskell/hslogger/default.nix index deb97d85fdc..af8300bf91f 100644 --- a/pkgs/development/tools/haskell/hslogger/default.nix +++ b/pkgs/development/tools/haskell/hslogger/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, network, time }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix index ea61fd9b6ed..a6986c1cdc5 100644 --- a/pkgs/development/tools/haskell/jailbreak-cabal/default.nix +++ b/pkgs/development/tools/haskell/jailbreak-cabal/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 8a5bc8eb7c8..496ba1d3e48 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive , conduit, conduitExtra, dataDefault, filepath, fsnotify, hspec , httpClient, httpConduit, httpReverseProxy, httpTypes, liftedBase @@ -9,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.1"; - sha256 = "19isyslrxbp430ira7v2d3r5f1j1526rg7v6lzzyl3dsyfpvxjg6"; + version = "1.3.2"; + sha256 = "1vmn7aaljwg3gv6vbj9z5w2mffsls5d6mzs4rg9s3rh8khb14cr0"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix index 8acee158683..c68d5dec8b3 100644 --- a/pkgs/development/tools/haskell/packunused/default.nix +++ b/pkgs/development/tools/haskell/packunused/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, haskellSrcExts, optparseApplicative , split }: diff --git a/pkgs/development/tools/haskell/profiteur/default.nix b/pkgs/development/tools/haskell/profiteur/default.nix index 748b0093ba2..2cc73ca6672 100644 --- a/pkgs/development/tools/haskell/profiteur/default.nix +++ b/pkgs/development/tools/haskell/profiteur/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, attoparsec, filepath, text, unorderedContainers , vector }: diff --git a/pkgs/development/tools/haskell/rehoo/default.nix b/pkgs/development/tools/haskell/rehoo/default.nix index 016070f66c3..f7993feddf8 100644 --- a/pkgs/development/tools/haskell/rehoo/default.nix +++ b/pkgs/development/tools/haskell/rehoo/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, parallelIo, shelly, split, systemFilepath, text }: diff --git a/pkgs/development/tools/haskell/splot/default.nix b/pkgs/development/tools/haskell/splot/default.nix index 987715a9cf8..0e984778579 100644 --- a/pkgs/development/tools/haskell/splot/default.nix +++ b/pkgs/development/tools/haskell/splot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime , time, vcsRevision }: diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 1158221ad1a..d52b4dec70f 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, binary, cairo, deepseq, filepath, ghcEvents, glib, gtk , mtl, pango, time }: diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 6ae2b40b081..4342b877a2e 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, bytestringLexing, cairo, Chart, ChartCairo, colour , dataDefault, lens, regexTdfa, strptime, time, transformers , vcsRevision diff --git a/pkgs/development/tools/haskell/una/default.nix b/pkgs/development/tools/haskell/una/default.nix index 172949818a6..9b80f6d478a 100644 --- a/pkgs/development/tools/haskell/una/default.nix +++ b/pkgs/development/tools/haskell/una/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, cmdargs, filepath, ioStorage }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/uuagc/bootstrap.nix b/pkgs/development/tools/haskell/uuagc/bootstrap.nix index d24d22f350a..ddd4890261d 100644 --- a/pkgs/development/tools/haskell/uuagc/bootstrap.nix +++ b/pkgs/development/tools/haskell/uuagc/bootstrap.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, mtl, uulib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index 38be593a1f0..79c8f513b9b 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, Cabal, filepath, mtl, uulib }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index d61746ddbe1..43cf0cafd22 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, haskellSrcExts, mtl, uuagcCabal, uulib }: cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.50.2"; - sha256 = "1f587g4lf1gc5j9wd2fzxhjrny0a9axkpj6znxwsiylcpqw39dqs"; + version = "0.9.51"; + sha256 = "07nymg525x41y8pl94d0n990h1yz5km8v0fasiggqv94sd04j22w"; isLibrary = true; isExecutable = true; buildDepends = [ filepath haskellSrcExts mtl uuagcCabal uulib ]; diff --git a/pkgs/development/tools/misc/ShellCheck/default.nix b/pkgs/development/tools/misc/ShellCheck/default.nix index 328cba4145f..8beca12325b 100644 --- a/pkgs/development/tools/misc/ShellCheck/default.nix +++ b/pkgs/development/tools/misc/ShellCheck/default.nix @@ -1,16 +1,19 @@ -{ cabal, json, mtl, parsec, regexCompat }: +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, json, mtl, parsec, QuickCheck, regexCompat }: cabal.mkDerivation (self: { pname = "ShellCheck"; - version = "0.3.3"; - sha256 = "15lmc7cbi6s852qhd6h9asgz7ss1khfhq7wj4sgblr5mgppldg93"; + version = "0.3.4"; + sha256 = "07fw8c33p7h1kvg899dwnvqpxpywcidhbw9jhjd8xsma7kz471iw"; isLibrary = true; isExecutable = true; - buildDepends = [ json mtl parsec regexCompat ]; + buildDepends = [ json mtl parsec QuickCheck regexCompat ]; + testDepends = [ json mtl parsec QuickCheck regexCompat ]; meta = { homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; - license = self.stdenv.lib.licenses.agpl3Plus; + license = "unknown"; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index e55faaa1e63..9e3abab382d 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -3,18 +3,18 @@ let libphutil = fetchgit { url = "git://github.com/facebook/libphutil.git"; - rev = "7e75bf271c669b61eb6e6e2ea312a36e64b80a4a"; - sha256 = "ffb7ee8141b925889e9bbc945d2f38f12d1489148b9c9b7eaeadd7524d254a78"; + rev = "d8c026530d7f442eb0f93233b536cfb06aec911d"; + sha256 = "6cbeb5b7640371f95ef017f3382f33a985a5c417f69e837fbb3b59c0332b5ecf"; }; arcanist = fetchgit { url = "git://github.com/facebook/arcanist.git"; - rev = "50caec620a8ed45c54323cb71fee72fd0d935115"; - sha256 = "dd18ed22375ad1ba058703952be0d339d9c93704e9d75dd7e4e6625236dfe9b0"; + rev = "a9535446579af33dfa50f60dcc79c9edf633eebd"; + sha256 = "8468f3beecdce2f62dc010ddade8ffbf0a8802f23ee88b91e09c09f173e692f6"; }; in stdenv.mkDerivation rec { name = "arcanist-${version}"; - version = "20140606"; + version = "20140717"; src = [ arcanist libphutil ]; buildInputs = [ php makeWrapper flex ]; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix new file mode 100644 index 00000000000..4170570e08a --- /dev/null +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "chrpath-0.16"; + + src = fetchurl { + url = "https://alioth.debian.org/frs/download.php/file/3979/chrpath-0.16.tar.gz"; + sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv"; + }; + + meta = with stdenv.lib; { + description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries"; + longDescription = '' + chrpath changes, lists or removes the rpath or runpath setting in a + binary. The rpath, or runpath if it is present, is where the runtime + linker should look for the libraries needed for a program. + ''; + homepage = https://alioth.debian.org/projects/chrpath/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index 72a6571f3cc..edd0a52f2c6 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, polyparse }: cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.4"; - sha256 = "0rmcq66wn7lsc5g1wk6bbsr7jiw8h6bz5cbvdywnv7vmwsx8gh51"; + version = "1.18.5"; + sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7"; isLibrary = true; isExecutable = true; buildDepends = [ polyparse ]; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index d4847afc786..852c1b74219 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,7 +1,6 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, pango, gdk_pixbuf, atk, pep8, python, makeWrapper -, pygobject3, gobjectIntrospection, libwnck3 -, gnome_icon_theme }: +, pango, gdk_pixbuf, atk, pep8, python, makeWrapper, gnome3 +, pygobject3, gobjectIntrospection, libwnck3 }: let version = "${major}.8"; @@ -18,16 +17,19 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 pep8 python + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic makeWrapper pygobject3 libwnck3 ]; - postInstall = + preFixup = '' wrapProgram $out/bin/d-feet \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${gtk3}/lib:${atk}/lib:${libwnck3}/lib" \ - --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" + + rm $out/share/icons/hicolor/icon-theme.cache ''; meta = { diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index beed6032393..9e400cc5c62 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "The DejaGNU testing framework"; + description = "Framework for testing other programs"; longDescription = '' DejaGnu is a framework for testing other programs. Its purpose diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 36a57e8fe96..7334fa8754f 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -1,43 +1,52 @@ -{ stdenv, fetchurl, libftdi, libusb1 }: +{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }: + +# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers. +# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to +# configure. stdenv.mkDerivation rec { name = "openocd-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2"; - sha256 = "0qwfyd821sy5p0agz0ybgn5nd7vplipw4mhm485ldj1hcmw7n8sj"; + sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv"; }; - configureFlags = [ "--enable-ft2232_libftdi" - "--enable-jlink" - "--enable-rlink" - "--enable-ulink" - "--enable-stlink" ]; - - buildInputs = [ libftdi libusb1 ]; + buildInputs = [ libftdi libusb1 pkgconfig ]; + + configureFlags = [ + "--enable-jtag_vpi" + "--enable-usb_blaster_libftdi" + "--enable-amtjtagaccel" + "--enable-gw16012" + "--enable-presto_libftdi" + "--enable-openjtag_ftdi" + "--enable-oocd_trace" + "--enable-buspirate" + "--enable-sysfsgpio" + "--enable-remote-bitbang" + ]; postInstall = '' mkdir -p "$out/etc/udev/rules.d" - ln -s "$out/share/openocd/contrib/openocd.udev" "$out/etc/udev/rules.d/99-openocd.rules" + ln -s "$out/share/openocd/contrib/99-openocd.rules" "$out/etc/udev/rules.d/99-openocd.rules" ''; - meta = { + meta = with stdenv.lib; { + description = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"; + longDescription = '' + OpenOCD provides on-chip programming and debugging support with a layered + architecture of JTAG interface and TAP support, debug target support + (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, etc.). Several + network interfaces are available for interactiving with OpenOCD: HTTP, + telnet, TCL, and GDB. The GDB server enables OpenOCD to function as a + "remote target" for source-level debugging of embedded systems using the + GNU GDB program. + ''; homepage = http://openocd.sourceforge.net/; - description = "OpenOCD, an on-chip debugger"; - - longDescription = - '' OpenOCD provides on-chip programming and debugging support with a - layered architecture of JTAG interface and TAP support, debug target - support (e.g. ARM, MIPS), and flash chip drivers (e.g. CFI, NAND, - etc.). Several network interfaces are available for interactiving - with OpenOCD: HTTP, telnet, TCL, and GDB. The GDB server enables - OpenOCD to function as a "remote target" for source-level debugging - of embedded systems using the GNU GDB program. - ''; - - license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [ viric bjornfor ]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ viric bjornfor ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix new file mode 100644 index 00000000000..15abc1f48c1 --- /dev/null +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, libelf }: + +let + version = "20130503"; +in +stdenv.mkDerivation rec { + name = "prelink-${version}"; + + buildInputs = [ libelf ]; + + src = fetchurl { + url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; + sha256 = "1w20f6ilqrz8ca51qhrn1n13h7q1r34k09g33d6l2vwvbrhcffb3"; + }; + + meta = { + homepage = http://people.redhat.com/jakub/prelink/; + license = "GPL"; + description = "ELF prelinking utility to speed up dynamic linking"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 80c6b20e69d..09978b5ad65 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { # 'make check' uses boost and tcl buildInputs = stdenv.lib.optionals doCheck [ boost tcl ]; + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; + meta = { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index d5aeac2eef8..804e7a2527f 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "http://www.gnu.org/software/texinfo/"; description = "GNU Texinfo, the GNU documentation system"; license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; longDescription = '' Texinfo is the official documentation format of the GNU project. diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index 48a823c3c65..303cdf89a05 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: -stdenv.mkDerivation { - name = "usb-modeswitch-1.1.2"; +stdenv.mkDerivation rec { + name = "usb-modeswitch-2.2.0"; src =fetchurl { - url = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-1.1.2.tar.bz2"; - sha256 = "1wzhd0r49nh5y43qrvsi3c7a29206zwd6v8xlpb8dqm40xg3j9nz"; + url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2"; + sha256 = "0flaj3mq0xhzk72kkpclwglf77kcw5rkwvkaimn5zvbiw4yi0li7"; }; # make clean: we always build from source. It should be necessary on x86_64 only @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags="DESTDIR=$out PREFIX=$out" ''; - buildInputs = [ libusb ]; + buildInputs = [ pkgconfig libusb1 ]; meta = { license = "GPLv2"; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix new file mode 100644 index 00000000000..04475959f3d --- /dev/null +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib}: +let + pname = "cppo"; + version = "0.9.4"; + webpage = "http://mjambon.com/${pname}.html"; +in +stdenv.mkDerivation rec { + + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + sha256 = "1m7cbja7cf74l45plqnmjrjjz55v8x65rvx0ikk9mg1ak8lcmvxa"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + makeFlags = "PREFIX=$(out)"; + + preBuild = '' + mkdir $out/bin + ''; + + meta = { + description = "The C preprocessor for OCaml"; + longDescription = '' + Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants. + ''; + homepage = "${webpage}"; + license = "bsd"; + }; +} + + + diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix new file mode 100644 index 00000000000..5cea753dd9c --- /dev/null +++ b/pkgs/development/tools/packer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "packer-0.6.0"; + + src = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + }; + + buildInputs = [ gox ]; + + installPhase = '' + export GOPATH=$src + XC_ARCH=$(go env GOARCH) + XC_OS=$(go env GOOS) + + ensureDir $out/bin + + cd $src/src/github.com/mitchellh/packer + gox \ + -os="''${XC_OS}" \ + -arch="''${XC_ARCH}" \ + -output "$out/bin/packer-{{.Dir}}" \ + ./... + mv $out/bin/packer{*packer*,} + ''; + + meta = with stdenv.lib; { + description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; + homepage = "http://www.packer.io"; + license = licenses.mpl20; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix new file mode 100644 index 00000000000..ce56ecad8a2 --- /dev/null +++ b/pkgs/development/tools/packer/deps.nix @@ -0,0 +1,307 @@ +{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: + +let + goDeps = [ + { + root = "github.com/mitchellh/packer"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "packer"; + rev = "12e28f257f66299e3bb13a053bf06ccd236e7efd"; + sha256 = "1r5j864kr7lx137c23kk5s82znk11hsrgq98zfz5r8sbzq1xpbzw"; + }; + } + { + root = "code.google.com/p/go.crypto"; + src = fetchhg { + url = "http://code.google.com/p/go.crypto"; + rev = "199"; + sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh"; + }; + } + { + root = "code.google.com/p/goauth2"; + src = fetchhg { + url = "http://code.google.com/p/goauth2"; + rev = "67"; + sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah"; + }; + } + { + root = "code.google.com/p/google-api-go-client"; + src = fetchhg { + url = "http://code.google.com/p/google-api-go-client"; + rev = "111"; + sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16"; + }; + } + { + root = "code.google.com/p/gosshold"; + src = fetchhg { + url = "http://code.google.com/p/gosshold"; + rev = "2"; + sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8"; + }; + } + { + root = "github.com/ActiveState/tail"; + src = fetchFromGitHub { + owner = "ActiveState"; + repo = "tail"; + rev = "8dcd1ad3e57aa8ce5614a837cbbdb21945fbb55a"; + sha256 = "1jxj576dd7mawawwg5nzwf6k7sks0r3lp2x8f6kxaps50n3k1wiz"; + }; + } + { + root = "github.com/howeyc/fsnotify"; + src = fetchFromGitHub { + owner = "howeyc"; + repo = "fsnotify"; + rev = "441bbc86b167f3c1f4786afae9931403b99fdacf"; + sha256 = "1v5vrwhmidxjj6sppinyizf85v60zrmn7i6c9xk0pvx6k0kw2mr2"; + }; + } + { + root = "launchpad.net/tomb"; + src = fetchbzr { + url = "https://launchpad.net/tomb"; + rev = "17"; + sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0"; + }; + } + { + root = "github.com/going/toolkit"; + src = fetchFromGitHub { + owner = "going"; + repo = "toolkit"; + rev = "6185c1893604d52d36a97dd6bb1247ace93a9b80"; + sha256 = "1kzy5yppalcidsmv5yxmr6lpqplqj07kdqpn77fdp6fbb0y0sg11"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "http://code.google.com/p/goprotobuf"; + rev = "246"; + sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4"; + }; + } + { + root = "github.com/bmizerany/assert"; + src = fetchFromGitHub { + owner = "bmizerany"; + repo = "assert"; + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + }; + } + { + root = "github.com/kr/pretty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pretty"; + rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; + sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + }; + } + { + root = "github.com/kr/text"; + src = fetchFromGitHub { + owner = "kr"; + repo = "text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + }; + } + { + root = "github.com/kr/pty"; + src = fetchFromGitHub { + owner = "kr"; + repo = "pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + root = "github.com/xiocode/toolkit"; + src = fetchFromGitHub { + owner = "xiocode"; + repo = "toolkit"; + rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5"; + sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3"; + }; + } + { + root = "launchpad.net/gocheck"; + src = fetchbzr { + url = "https://launchpad.net/gocheck"; + rev = "87"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + }; + } + { + root = "github.com/hashicorp/go-version"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-version"; + rev = "bb92dddfa9792e738a631f04ada52858a139bcf7"; + sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m"; + }; + } + { + root = "github.com/mitchellh/go-fs"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "go-fs"; + rev = "faaa223588dd7005e49bf66fa2d19e35c8c4d761"; + sha256 = "19jsvy35g14f18ckymzxasy0zfd6n99zlqg6grpj1yqdfxfvqn9b"; + }; + } + { + root = "github.com/mitchellh/go-vnc"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "go-vnc"; + rev = "fc93dd80f5da4ccde0a9d97f0c73e56e04e0cf72"; + sha256 = "03rwsp1frvfx6c7yxr711lq7jdgsr1gcwg14jw26xvbzzxwjvnsf"; + }; + } + { + root = "github.com/mitchellh/goamz"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "goamz"; + rev = "c3ff5f734c89f1ea1f290c6aadbbceeeb19a623c"; + sha256 = "1nyi1p5yh21r161icnwkcgmj2y38b4m1jis47vvjbqinrp45w1gq"; + }; + } + { + root = "github.com/motain/gocheck"; + src = fetchFromGitHub { + owner = "motain"; + repo = "gocheck"; + rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84"; + sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd"; + }; + } + { + root = "github.com/mitchellh/iochan"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } + { + root = "github.com/mitchellh/mapstructure"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "mapstructure"; + rev = "743fcf103ac7cdbc159e540d9d0e3a7889b87d68"; + sha256 = "1qqxsnxabd7c04n0ip1wmpr2g913qchqrbmblq0shrf5p1hnszgn"; + }; + } + { + root = "github.com/mitchellh/multistep"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "multistep"; + rev = "162146fc57112954184d90266f4733e900ed05a5"; + sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3"; + }; + } + { + root = "github.com/mitchellh/osext"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "osext"; + rev = "0dd3f918b21bec95ace9dc86c7e70266cfc5c702"; + sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23"; + }; + } + { + root = "github.com/mitchellh/panicwrap"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "panicwrap"; + rev = "1aedff2aaa8b8ff7f65ab58e94ef9f593e2e3bf4"; + sha256 = "05brbpc7kizzbs1a128fmjddh7rdyg0jzzxgbvrl58cgklh4yzaa"; + }; + } + { + root = "github.com/rackspace/gophercloud"; + src = fetchFromGitHub { + owner = "rackspace"; + repo = "gophercloud"; + rev = "2285a429874c1365ef6c6d3ceb08b1d428e26aca"; + sha256 = "0py3h64r4wkl2r9j7xlh81nazpg2b0r5ba9iblh6d1380yk4fa7f"; + }; + } + { + root = "github.com/racker/perigee"; + src = fetchFromGitHub { + owner = "racker"; + repo = "perigee"; + rev = "01db3191866051f2ec854c2d876ac1a179d3049c"; + sha256 = "05pmlgwjynbr59bw50zhrklzhr5pgnij9ym5hqvijjrpw3qd9ivf"; + }; + } + { + root = "github.com/ugorji/go"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } + { + root = "github.com/vmihailenco/msgpack"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "msgpack"; + rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; + sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + }; + } + { + root = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go-msgpack"; + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + } + { + root = "launchpad.net/mgo"; + src = fetchbzr { + url = "https://launchpad.net/mgo"; + rev = "2"; + sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; + }; + } + { + root = "github.com/vmihailenco/bufio"; + src = fetchFromGitHub { + owner = "vmihailenco"; + repo = "bufio"; + rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; + sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} diff --git a/pkgs/development/tools/parsing/Ebnf2ps/default.nix b/pkgs/development/tools/parsing/Ebnf2ps/default.nix index 82d998c2fcb..5267849a9bc 100644 --- a/pkgs/development/tools/parsing/Ebnf2ps/default.nix +++ b/pkgs/development/tools/parsing/Ebnf2ps/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/parsing/alex/3.0.1.nix b/pkgs/development/tools/parsing/alex/3.0.1.nix index cdcaead8635..0433ca3adde 100644 --- a/pkgs/development/tools/parsing/alex/3.0.1.nix +++ b/pkgs/development/tools/parsing/alex/3.0.1.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, perl, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/parsing/alex/3.0.2.nix b/pkgs/development/tools/parsing/alex/3.0.2.nix index 9011db12c7d..c11a64cb2ec 100644 --- a/pkgs/development/tools/parsing/alex/3.0.2.nix +++ b/pkgs/development/tools/parsing/alex/3.0.2.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, perl, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/parsing/alex/3.1.3.nix b/pkgs/development/tools/parsing/alex/3.1.3.nix index 8174d851a31..b0f57d4d833 100644 --- a/pkgs/development/tools/parsing/alex/3.1.3.nix +++ b/pkgs/development/tools/parsing/alex/3.1.3.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, happy, perl, QuickCheck }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 8d68479dd0e..23141185f68 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -8,4 +8,17 @@ stdenv.mkDerivation { }; patches = [ ./2.7.7-fixes.patch ]; buildInputs = [jdk python]; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/parsing/antlr/default.nix b/pkgs/development/tools/parsing/antlr/default.nix index deb8040256b..e866f61f25a 100644 --- a/pkgs/development/tools/parsing/antlr/default.nix +++ b/pkgs/development/tools/parsing/antlr/default.nix @@ -8,4 +8,17 @@ stdenv.mkDerivation { md5 = "6a7e70ccece8149b735cc3aaa24241cc"; }; inherit jre; + + meta = with stdenv.lib; { + description = "Powerful parser generator"; + longDescription = '' + ANTLR (ANother Tool for Language Recognition) is a powerful parser + generator for reading, processing, executing, or translating structured + text or binary files. It's widely used to build languages, tools, and + frameworks. From a grammar, ANTLR generates a parser that can build and + walk parse trees. + ''; + homepage = http://www.antlr.org/; + platforms = platforms.linux; + }; } diff --git a/pkgs/development/tools/parsing/happy/1.18.10.nix b/pkgs/development/tools/parsing/happy/1.18.10.nix index d342d3381c8..0e3f730defd 100644 --- a/pkgs/development/tools/parsing/happy/1.18.10.nix +++ b/pkgs/development/tools/parsing/happy/1.18.10.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/parsing/happy/1.18.8.nix b/pkgs/development/tools/parsing/happy/1.18.8.nix deleted file mode 100644 index 141205d1940..00000000000 --- a/pkgs/development/tools/parsing/happy/1.18.8.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.18.8"; - sha256 = "1mqdawxszmdk71fbl8ljxz7jyhai00sflaw0gahp039n44mrspam"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patches = [ ./adapt-crazy-perl-regex-for-cpp-4.8.0.patch ]; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.9.nix b/pkgs/development/tools/parsing/happy/1.18.9.nix index b1f752ae35f..25e8dcb7b7e 100644 --- a/pkgs/development/tools/parsing/happy/1.18.9.nix +++ b/pkgs/development/tools/parsing/happy/1.18.9.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { diff --git a/pkgs/development/tools/parsing/happy/1.19.2.nix b/pkgs/development/tools/parsing/happy/1.19.2.nix deleted file mode 100644 index 4173d6d6c11..00000000000 --- a/pkgs/development/tools/parsing/happy/1.19.2.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.19.2"; - sha256 = "1m74dz83fs7gbcr040nhfx1xw3smjk24g5cp6a0wxvrmlh12yc66"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - patchPhase = "sed -i -e '/^import Data.Monoid/d' Setup.lhs"; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.19.3.nix b/pkgs/development/tools/parsing/happy/1.19.3.nix deleted file mode 100644 index c43806cd2df..00000000000 --- a/pkgs/development/tools/parsing/happy/1.19.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ cabal, mtl, perl }: - -cabal.mkDerivation (self: { - pname = "happy"; - version = "1.19.3"; - sha256 = "1q3hipgcwvrf333wlyqmg4mgf24gwiagddlfyr9zgi4k42p2373x"; - isLibrary = false; - isExecutable = true; - buildDepends = [ mtl ]; - buildTools = [ perl ]; - preConfigure = self.stdenv.lib.optional (self.stdenv.lib.versionOlder "7.9" self.ghc.version) '' - sed -i -e 's|extensions: |extensions: FlexibleContexts, |' happy.cabal - sed -i -e 's|> import System.Exit|> import System.Exit ( exitWith, ExitCode(..) )|' src/Main.lhs - ''; - meta = { - homepage = "http://www.haskell.org/happy/"; - description = "Happy is a parser generator for Haskell"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/tools/parsing/happy/1.18.11.nix b/pkgs/development/tools/parsing/happy/1.19.4.nix index 41f6d5c49a4..e7cd358fb82 100644 --- a/pkgs/development/tools/parsing/happy/1.18.11.nix +++ b/pkgs/development/tools/parsing/happy/1.19.4.nix @@ -1,9 +1,11 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, mtl, perl }: cabal.mkDerivation (self: { pname = "happy"; - version = "1.18.11"; - sha256 = "1hssiihzl7xipmn5bz71q30wbq2sj92lh2f7z4jarckhldwcqfi9"; + version = "1.19.4"; + sha256 = "0vcklr1y6yjf8z4wip4al2zw4qlfxcahbdxwpf6c9y31dkv9kr3b"; isLibrary = false; isExecutable = true; buildDepends = [ mtl ]; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix new file mode 100644 index 00000000000..7ac4f6d39b7 --- /dev/null +++ b/pkgs/development/tools/quilt/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgs}: + +with pkgs; + +stdenv.mkDerivation rec { + name = "quilt-0.63"; + + src = fetchurl { + url = "mirror://savannah/quilt/${name}.tar.gz"; + sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52"; + }; + + buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ]; + + postInstall = '' + wrapProgram $out/bin/quilt --prefix PATH : \ + ${perl}/bin:${bash}/bin:${diffstat}/bin:${diffutils}/bin:${findutils}/bin:${patch}/bin + ''; + + meta = { + homepage = http://savannah.nongnu.org/projects/quilt; + description = "Easily manage large numbers of patches"; + + longDescription = '' + Quilt allows you to easily manage large numbers of + patches by keeping track of the changes each patch + makes. Patches can be applied, un-applied, refreshed, + and more. + ''; + + license = "GPLv2+"; + }; +} diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 90f7647aa05..30430671342 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "chromedriver_linux64"; src = fetchurl { - url = "http://chromedriver.storage.googleapis.com/2.9/${name}.zip"; - sha256 = "1m5xl5pz445igvhj31hby97xbizlw05b8fc6w53zq7faw7mzm665"; + url = "http://chromedriver.storage.googleapis.com/2.10/${name}.zip"; + sha256 = "1949lhrv4hrmgapvypsgwzyr75w7vpy7nkkkwjkjxn61dkwmx4jw"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix new file mode 100644 index 00000000000..a0f7922b1aa --- /dev/null +++ b/pkgs/development/tools/sqsh/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, freetds, readline }: + +stdenv.mkDerivation rec { + version = "2.5.16.1"; + name = "sqsh-${version}"; + + src = fetchurl { + url = "http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sq/sqsh/sqsh/sqsh-2.5/${name}.tgz"; + sha256 = "1wi0hdmhk7l8nrz4j3kaa177mmxyklmzhj7sq1gj4q6fb8v1yr6n"; + }; + + preConfigure = + '' + export SYBASE=${freetds} + ''; + + buildInputs = [ + freetds + readline + ]; + + meta = { + description = "SQSH is command line tool for querying Sybase/MSSQL databases"; + longDescription = + '' + Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), + it is intended as a replacement for the venerable 'isql' program supplied + by Sybase. + ''; + homepage = "http://www.cs.washington.edu/~rose/sqsh/sqsh.html"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index d0870e82b72..072b8eeff5c 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,18 +4,18 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "vagrant-1.4.3"; + name = "vagrant-1.6.3"; src = if stdenv.system == "x86_64-linux" then fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb; - sha256 = "dbd06de0f3560e2d046448d627bca0cbb0ee34b036ef605aa87ed20e6ad2684b"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_x86_64.deb; + sha256 = "1gmdg92dw7afnvpji0wg4nzr7vhk8mrmcqk3hcrkwscby2f2bhqg"; } else fetchurl { - url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_i686.deb; - sha256 = "66e613fc1c9e31ecaf8e5f1d07d2ae4fca3d4fc2e43593543962664258d9af9b"; + url = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.6.3_i686.deb; + sha256 = "1z26b6yghqgx8jbi2igf4kk4h6rzy869gli2vj7ayl7vbqdfvb60"; }; meta = with stdenv.lib; { @@ -81,4 +81,13 @@ stdenv.mkDerivation rec { cp -r opt "$out" cp -r usr/bin "$out" ''; + + preFixup = '' + # 'hide' the template file from shebang-patching + chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable + ''; + + postFixup = '' + chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.2/lib/bundler/templates/Executable + ''; } diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix new file mode 100644 index 00000000000..90e31349e4f --- /dev/null +++ b/pkgs/development/tools/watchman/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre +, confFile ? config.watchman.confFile or null +}: + +stdenv.mkDerivation rec { + name = "watchman-${version}"; + + version = "2.9.8"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "watchman"; + rev = "v${version}"; + sha256 = "196d71ci7ki4p6xx49w55cqd0bqrx19nf79na3a91mrfa6f22sp6"; + }; + + buildInputs = [ autoconf automake pcre ]; + + configureFlags = [ + "--enable-conffile=${if confFile == null then "no" else confFile}" + "--with-pcre=yes" + ]; + + preConfigure = '' + ./autogen.sh + ''; + + meta = with lib; { + description = "Watches files and takes action when they change"; + homepage = https://facebook.github.io/watchman; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; linux ++ darwin; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 544634626b0..84b0da1674c 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -1,6 +1,6 @@ { stdenv, runCommand, nodejs, neededNatives}: -args @ { name, src, deps ? [], peerDependencies ? [], flags ? [], ... }: +args @ { name, src, deps ? [], peerDependencies ? [], flags ? [], preShellHook ? "", postShellHook ? "", ... }: with stdenv.lib; @@ -80,6 +80,16 @@ stdenv.mkDerivation ({ preFixup = concatStringsSep "\n" (map (src: '' find $out -type f -print0 | xargs -0 sed -i 's|${src}|${src.name}|g' '') src); + + shellHook = '' + ${preShellHook} + export PATH=${nodejs}/bin:$(pwd)/node_modules/.bin:$PATH + mkdir -p node_modules + ${concatStrings (concatMap (dep: map (name: '' + ln -sfv ${dep}/lib/node_modules/${name} node_modules/ + '') dep.names) deps)} + ${postShellHook} + ''; } // args // { # Run the node setup hook when this package is a build input propagatedNativeBuildInputs = (args.propagatedNativeBuildInputs or []) ++ [ nodejs ]; diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 4b79a500b1f..c53cee4a20e 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -6,7 +6,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = "0.10.28"; + version = "0.10.29"; # !!! Should we also do shared libuv? deps = { @@ -30,7 +30,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "043pc6sb3y2b0aiakmmjvzvafgki7wly0id0v1p8y80g3r2cdpdb"; + sha256 = "0pdib215ldypc149ad03wlfj0i8fwdfydd4q2hd7ry35yw0rsds7"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); |