diff options
Diffstat (limited to 'pkgs/development')
218 files changed, 6247 insertions, 4659 deletions
diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index d180de87cad..52a3b485d91 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "arachne-pnr-${version}"; - version = "2016.05.21"; + version = "2016.08.18"; src = fetchFromGitHub { owner = "cseed"; repo = "arachne-pnr"; - rev = "6b8336497800782f2f69572d40702b60423ec67f"; - sha256 = "11hg17f4lp8azc0ir0i473fz9c0dra82r4fn45cr3amd57v00qbf"; + rev = "52e69ed207342710080d85c7c639480e74a021d7"; + sha256 = "15bdw5yxj76lxrwksp6liwmr6l1x77isf4bs50ys9rsnmiwh8c3w"; }; preBuild = '' diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 190f2b7a96a..4957706ea0f 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "compcert-${version}"; - version = "2.6"; + version = "2.7.1"; src = fetchurl { url = "http://compcert.inria.fr/release/${name}.tgz"; - sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1"; + sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4"; }; buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]); diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ca3e9c6956d..85caa82a155 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { sed -ie 's#/usr/share/zoneinfo/#${tzdata}/share/zoneinfo/#g' \ $out/lib/factor/extra/tzinfo/tzinfo.factor - sed -ie 's#/usr/share/terminfo#${ncurses}/share/terminfo#g' \ + sed -ie 's#/usr/share/terminfo#${ncurses.out}/share/terminfo#g' \ $out/lib/factor/extra/terminfo/terminfo.factor cp ./factor $out/bin diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 57e670750db..0ecf4437c9a 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation { src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; + url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; + url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx"; } else throw "Not supported on ${stdenv.system}."; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 65c0f2ea1c5..7908d6d06ef 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \ + --set-rpath ${stdenv.lib.makeLibraryPath [ "$out" gcc ncurses ]} \ "$f" || true fi done diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index ec6f0ca8d14..955c683a43f 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -333,8 +333,8 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp} - --with-mpfr=${mpfr} + --with-gmp=${gmp.dev} + --with-mpfr=${mpfr.dev} --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 2df019bd7f1..5e5157215d3 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { (if stdenv.isLinux then '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libedit}/lib:${ncurses5.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${lib.makeLibraryPath [ libedit ncurses5 gmp ]}" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; done diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 9b9da4d4f78..6140cde4a9e 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ncurses5.out}/lib:${gmp.out}/lib" {} \; + --set-rpath "${stdenv.lib.makeLibraryPath [ ncurses5 gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 4f13954d1db..2e96c999b9e 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix index b8e9082f061..c059a89bde3 100644 --- a/pkgs/development/compilers/ghc/7.10.3.nix +++ b/pkgs/development/compilers/ghc/7.10.3.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index 5faae118d8c..25eabc769aa 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ln -sv "${ncurses5.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${gmp.out}/lib" {} \; + --set-rpath "${stdenv.lib.makeLibraryPath [ "$out" gmp ]}" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index fceade0741f..8341fca9f42 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -1,10 +1,16 @@ { stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, hscolour +, hscolour, patchutils }: let inherit (bootPkgs) ghc; + fetchFilteredPatch = args: fetchurl (args // { + downloadToTemp = true; + postFetch = '' + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" + ''; + }); in stdenv.mkDerivation rec { version = "8.0.1"; @@ -17,6 +23,10 @@ stdenv.mkDerivation rec { patches = [ ./ghc-8.x-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 + + # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 + (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) + (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) ]; buildInputs = [ ghc perl hscolour ]; @@ -54,7 +64,7 @@ stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 79234fd55ab..0f3b57949b7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { for i in "$out/bin/"*; do test ! -h $i || continue egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${binutils}/bin:${coreutils}/bin"' $i + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i done ''; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 1dc6805bcd3..36b6c21aebb 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { for prog in "$out/bin/julia" "$out/bin/julia-debug"; do wrapProgram "$prog" \ --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ - --prefix PATH : "${curl}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" done ''; diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 80aaf6dd01f..73c2cc0b30a 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -163,8 +163,8 @@ stdenv.mkDerivation rec { postInstall = '' for prog in "$out/bin/julia" "$out/bin/julia-debug"; do wrapProgram "$prog" \ - --prefix LD_LIBRARY_PATH : "$out/lib/julia:$LD_LIBRARY_PATH" \ - --prefix PATH : "${curl}/bin" + --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ curl ]}" done ''; diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index fb826648032..fc29d00a524 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -14,7 +14,7 @@ , compiler-rt_src , libcxxabi , debugVersion ? false -, enableSharedLibraries ? !stdenv.isDarwin +, enableSharedLibraries ? true }: let @@ -69,6 +69,11 @@ in stdenv.mkDerivation rec { paxmark m bin/{lli,llvm-rtdyld} ''; + postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib + ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib + ''; + enableParallelBuilding = true; passthru.src = src; diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index 64d86aaac0d..4fd71b748cc 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { make install PREFIX=$out wrapProgram $out/bin/microscheme \ - --prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ avrdude avrgcclibc ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index c4890c1ca88..2a72387028d 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -15,22 +15,22 @@ stdenv.mkDerivation rec { binSrc = if stdenv.system == "i686-linux" then (fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.x86-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz"; sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j"; }) else if stdenv.system == "x86_64-linux" then (fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-linux.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz"; sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn"; }) else if stdenv.system == "x86_64-darwin" then (fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz"; sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9"; }) else throw "Architecture not supported"; codeSrc = fetchurl { - url = "http://sourceforge.net/projects/mlton/files/mlton/${version}/${name}.src.tgz"; + url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz"; sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11"; }; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index ae040297313..e3dd950e0d1 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = "mozart-binary-${version}"; src = fetchurl { - url = "http://sourceforge.net/projects/mozart-oz/files/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; + url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz"; sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z"; }; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 40c71926279..2e691dc749d 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Paths so the opa compiler code generation will use the same programs as were # used to build opa. - codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin"; + codeGeneratorPaths = stdenv.lib.makeBinPath [ ocamlPackages.ocaml gcc binutils gnumake nodejs ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 49d1c64bfb9..8382be7a209 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { for a in "$out"/lib/*.so; do patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done - sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam + sed -i -e "s|\-lgc|\-L${boehmgc.out}\/lib -lgc|" $out/lib/config.jam wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin ''; diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index 5426b0162a7..e6186bc8f13 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -69,6 +69,8 @@ let fontconfig perl file bootjdk ]; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama"; postUnpack = '' diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index c42b39ce91f..6344b96db33 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -18,42 +18,42 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "102"; - build = "04"; + update = "122"; + build = "00"; baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u"; repover = "jdk8u${update}-b${build}"; paxflags = if stdenv.isi686 then "msp" else "m"; jdk8 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "1qwpkg169zrgx58iw8kzgr6l6chyh9n7ngkyabdfcp60i0qpga93"; + sha256 = "0biy2xpb6krinmpj5pqsz0vryd2m6i819csvqnv88rc3750qh13d"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0nj9h0651ks9rssy58ma2fvnc05viwbfc91a6dxhkr1935bmzh3p"; + sha256 = "1wy9n64fvxybpd8lqd2zbiv2z23nfp10bd098lhqw7z46yxbm3ra"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "07719n5bxi4yhqisnj77h4w6psih75ja3v7nx7j623ynbb7xjb07"; + sha256 = "1hzliyjaz0dq7l934d16c3ddx6kiszl2hkc2cs0rhb09m7q4zcv7"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "0gf1gy4xbzxda8pwm10lh0kbjrh5icz4pxzlbhnkxq44xvl29vd3"; + sha256 = "0576r009my434fgv9m7lwd5bvvgbb182aw8z8fwwbi36mf5j3sr5"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "0k5kzp9r3zny8kg9m6jad3gckf8dshlss5dd5v28njpzcsfrsd2v"; + sha256 = "1hn40jm2fcs037zx30k1gxw6j24hr50a78zjjaaql73yhhzf74xh"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1jw5w88yi59xarvak8rx4951090ri7jihkd17f29j1hbk6fzv052"; + sha256 = "1lbvaw3ck0inz9376qh9nw8d1ys93plfpsn1sp9mmwdjyglvznif"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "151fwhz1x947a1bw0wgdrkzqw6hzfrlgn682jrjn8dvyjz7inka4"; + sha256 = "11viwry7fj70wgzfbpslb6j1zpqqzicdf8yyqhw3whf7l6wx2bav"; }; nashorn = fetchurl { url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = "1vacw1hg1vgz5ydgw1m57bynq0zl5glxpgzznrajnqbwd9yq6rzp"; + sha256 = "057g393kjb9via2a3x3zm7r4g9dslw0nkwn6yppzd8hal325s1wa"; }; openjdk8 = stdenv.mkDerivation { name = "openjdk-8u${update}b${build}"; @@ -101,6 +101,10 @@ let "--enable-unlimited-crypto" "--disable-debug-symbols" "--disable-freetype-bundling" + + # glibc 2.24 deprecated readdir_r so we need this + # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html + "--with-extra-cflags=\"-Wno-error=deprecated-declarations\"" ] ++ (if minimal then [ "--disable-headful" "--with-zlib=bundled" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index e5f7612c487..93ce5037fed 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { checkTarget = "test"; preCheck = '' - export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib" + export LIBRARY_PATH="$out/lib:${stdenv.lib.makeLibraryPath [ openssl pcre2 ]}" ''; installPhase = '' diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix new file mode 100644 index 00000000000..463481a1547 --- /dev/null +++ b/pkgs/development/compilers/solc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, boost, cmake, jsoncpp }: + +stdenv.mkDerivation rec { + version = "0.3.6"; + name = "solc-${version}"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "solidity"; + rev = "v${version}"; + sha256 = "1cynqwy8wr63l3l4wv9z6shhcy6lq0q8pbsh3nav0dg9qgj9sg57"; + }; + + buildInputs = [ boost cmake jsoncpp ]; + + meta = { + description = "Compiler for Ethereum smart contract language Solidity"; + longDescription = "This package also includes `lllc', the LLL compiler."; + homepage = https://github.com/ethereum/solidity; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.dbrock ]; + inherit version; + }; +} diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 8aa980b72e6..059a9e7dbe3 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postPatch = '' for i in squeak.in squeak.sh.in; do substituteInPlace unix/cmake/$i --replace "PATH=" \ - "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #" + "PATH=${stdenv.lib.makeBinPath [ coreutils gnused which ]} #" done ''; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/0.23.nix index 13b9c5f3983..13b9c5f3983 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/0.23.nix diff --git a/pkgs/development/compilers/vala/0.32.nix b/pkgs/development/compilers/vala/0.32.nix index 8ae76ec1b05..202b9fff6c8 100644 --- a/pkgs/development/compilers/vala/0.32.nix +++ b/pkgs/development/compilers/vala/0.32.nix @@ -4,8 +4,8 @@ let major = "0.32"; - minor = "0"; - sha256 = "0vpvq403vdd25irvgk7zibz3nw4x4i17m0dgnns8j1q4vr7am8h7"; + minor = "1"; + sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; in stdenv.mkDerivation rec { name = "vala-${major}.${minor}"; @@ -27,4 +27,5 @@ stdenv.mkDerivation rec { buildInputs = [ glib libiconv ] ++ libintlOrEmpty; + } diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index d0b8ae7cf82..c424003fcbb 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -2,30 +2,30 @@ stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2016.05.21"; + version = "2016.08.18"; srcs = [ (fetchFromGitHub { owner = "cliffordwolf"; repo = "yosys"; - rev = "8e9e793126a2772eed4b041bc60415943c71d5ee"; - sha256 = "1s0x7n7qh2qbfc0d7p4q10fvkr61jdqgyqzijr422rabh9zl4val"; + rev = "9b8e06bee177f53c34a9dd6dd907a822f21659be"; + sha256 = "0x5c1bcayahn7pbgycxkxr6lkv9m0jpwfdlmyp2m9yzm2lpyw7dg"; name = "yosys"; }) (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; - rev = "d9559ab"; - sha256 = "08far669khb65kfpqvjqmqln473j949ak07xibfdjdmiikcy533i"; - name = "abc"; + rev = "a2e5bc66a68a"; + sha256 = "09yvhj53af91nc54gmy7cbp7yljfcyj68a87494r5xvdfnsj11gy"; + name = "yosys-abc"; }) ]; sourceRoot = "yosys"; buildInputs = [ pkgconfig tcl readline libffi python3 bison flex ]; preBuild = '' - chmod -R u+w ../abc - ln -s ../abc abc + chmod -R u+w ../yosys-abc + ln -s ../yosys-abc abc make config-gcc echo 'ABCREV := default' >> Makefile.conf makeFlags="PREFIX=$out $makeFlags" diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index e6373c1d50e..72c91daac40 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -55,13 +55,8 @@ let else abort "Unrecognized package fetch type"; }; - importGodeps = { depsFile, filterPackages ? [] }: - let - deps = lib.importJSON depsFile; - external = filter (d: d ? include) deps; - direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps; - in - concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct); + importGodeps = { depsFile }: + map dep2src (lib.importJSON depsFile); goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json deleted file mode 100644 index 9e1b4369136..00000000000 --- a/pkgs/development/go-modules/libs.json +++ /dev/null @@ -1,1820 +0,0 @@ -[ - { - "goPackagePath": "github.com/elves/getopt", - "fetch": { - "type": "git", - "url": "https://github.com/elves/getopt", - "rev": "f91a7bf920995832d55a1182f26657bc975b9c24", - "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za" - } - }, - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/docopt/docopt-go", - "fetch": { - "type": "git", - "url": "https://github.com/docopt/docopt-go", - "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/janimo/textsecure", - "fetch": { - "type": "git", - "url": "https://github.com/janimo/textsecure", - "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6", - "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "gopkg.in/mgo.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/mgo.v2", - "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a", - "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/hanwen/go-fuse", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/go-fuse", - "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e", - "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56" - } - }, - { - "goPackagePath": "github.com/cpucycle/astrotime", - "fetch": { - "type": "git", - "url": "https://github.com/cpucycle/astrotime", - "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca", - "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1" - } - }, - { - "goPackagePath": "github.com/godbus/dbus", - "fetch": { - "type": "git", - "url": "https://github.com/godbus/dbus", - "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15", - "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/syndtr/gocapability", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/gocapability", - "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852", - "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/log15.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/inconshreveable/log15.v2", - "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f", - "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8" - } - }, - { - "goPackagePath": "github.com/gorilla/mux", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/mux", - "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5", - "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9" - } - }, - { - "goPackagePath": "github.com/pborman/uuid", - "fetch": { - "type": "git", - "url": "https://github.com/pborman/uuid", - "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4", - "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn" - } - }, - { - "goPackagePath": "gopkg.in/flosch/pongo2.v3", - "fetch": { - "type": "git", - "url": "https://gopkg.in/flosch/pongo2.v3", - "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9", - "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "cca8bbc0798408af109aaaa239cbd2634846b340", - "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - }, - { - "goPackagePath": "gopkg.in/lxc/go-lxc.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/lxc/go-lxc.v2", - "rev": "8f9e220b36393c03854c2d224c5a55644b13e205", - "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/dustinkirkland/golang-petname", - "fetch": { - "type": "git", - "url": "https://github.com/dustinkirkland/golang-petname", - "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c", - "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl" - } - }, - { - "goPackagePath": "github.com/gorilla/context", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/context", - "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd", - "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/gosexy/gettext", - "fetch": { - "type": "git", - "url": "https://github.com/gosexy/gettext", - "rev": "305f360aee30243660f32600b87c3c1eaa947187", - "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/inconshreveable/go-vhost", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-vhost", - "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c", - "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32" - } - }, - { - "goPackagePath": "code.google.com/p/log4go", - "fetch": { - "type": "git", - "url": "https://github.com/ccpaging/log4go", - "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8", - "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2" - } - }, - { - "goPackagePath": "github.com/daviddengcn/go-colortext", - "fetch": { - "type": "git", - "url": "https://github.com/daviddengcn/go-colortext", - "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57", - "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-yaml/yaml", - "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a", - "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/go-update.v0", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-update", - "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066", - "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/kr/binarydist", - "fetch": { - "type": "git", - "url": "https://github.com/kr/binarydist", - "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd", - "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "40456948a47496dc22168e6af39297a2f8fbf38c", - "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/stathat/go", - "fetch": { - "type": "git", - "url": "https://github.com/stathat/go", - "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93", - "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "github.com/schachmat/ingo", - "fetch": { - "type": "git", - "url": "https://github.com/schachmat/ingo", - "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38", - "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb" - } - }, - { - "goPackagePath": "github.com/michaelmacinnis/adapted", - "fetch": { - "type": "git", - "url": "https://github.com/michaelmacinnis/adapted", - "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978", - "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner", - "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060", - "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317" - } - }, - { - "goPackagePath": "github.com/mitchellh/iochan", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/iochan", - "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77", - "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4", - "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "github.com/mesos/mesos-go", - "fetch": { - "type": "git", - "url": "https://github.com/mesos/mesos-go", - "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969", - "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk" - } - }, - { - "goPackagePath": "github.com/pmezard/go-difflib", - "fetch": { - "type": "git", - "url": "https://github.com/pmezard/go-difflib", - "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d", - "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/stretchr/objx", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/objx", - "rev": "cbeaeb16a013161a98496fad62933b1d21786672", - "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew", - "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", - "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" - } - }, - { - "goPackagePath": "github.com/emicklei/go-restful", - "fetch": { - "type": "git", - "url": "https://github.com/emicklei/go-restful", - "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d", - "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x" - } - }, - { - "goPackagePath": "github.com/stretchr/testify", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/testify", - "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff", - "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "67e2db24c831afa6c64fc17b4a143390674365ef", - "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d" - } - }, - { - "goPackagePath": "github.com/braintree/manners", - "fetch": { - "type": "git", - "url": "https://github.com/braintree/manners", - "rev": "cab36f97339b1925cd89e158632728025557e550", - "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec", - "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3" - } - }, - { - "goPackagePath": "github.com/elazarl/go-bindata-assetfs", - "fetch": { - "type": "git", - "url": "https://github.com/elazarl/go-bindata-assetfs", - "rev": "d5cac425555ca5cf00694df246e04f05e6a55150", - "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17" - } - }, - { - "goPackagePath": "github.com/fatih/structs", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/structs", - "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f", - "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-snappystream", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-snappystream", - "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", - "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" - } - }, - { - "goPackagePath": "github.com/bitly/go-nsq", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-nsq", - "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29", - "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2", - "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7" - } - }, - { - "goPackagePath": "github.com/bmizerany/perks", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/perks", - "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607", - "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/bitly/go-hostpool", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-hostpool", - "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2", - "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g" - } - }, - { - "goPackagePath": "github.com/bitly/timer_metrics", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/timer_metrics", - "rev": "afad1794bb13e2a094720aeb27c088aa64564895", - "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/18F/hmacauth", - "fetch": { - "type": "git", - "url": "https://github.com/18F/hmacauth", - "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd", - "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics", - "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25", - "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/hashicorp/logutils", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/logutils", - "rev": "0dc08b1671f34c4250ce212759ebd880f743d883", - "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r" - } - }, - { - "goPackagePath": "github.com/armon/go-radix", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-radix", - "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93", - "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "goPackagePath": "github.com/hashicorp/memberlist", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/memberlist", - "rev": "6025015f2dc659ca2c735112d37e753bda6e329d", - "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "github.com/armon/circbuf", - "fetch": { - "type": "git", - "url": "https://github.com/armon/circbuf", - "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf", - "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s" - } - }, - { - "goPackagePath": "github.com/hashicorp/mdns", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/mdns", - "rev": "2b439d37011456df8ff83a70ffd1cd6046410113", - "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96" - } - }, - { - "goPackagePath": "github.com/mitchellh/cli", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/cli", - "rev": "8102d0ed5ea2709ade1243798785888175f6e415", - "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2" - } - }, - { - "goPackagePath": "github.com/ryanuber/columnize", - "fetch": { - "type": "git", - "url": "https://github.com/ryanuber/columnize", - "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a", - "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go.net", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go.net", - "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29", - "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/tools", - "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", - "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" - } - }, - { - "goPackagePath": "github.com/vincent-petithory/structfield", - "fetch": { - "type": "git", - "url": "https://github.com/vincent-petithory/structfield", - "rev": "01a738558a47fbf16712994d1737fb31c77e7d11", - "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw" - } - }, - { - "goPackagePath": "github.com/aybabtme/rgbterm", - "fetch": { - "type": "git", - "url": "https://github.com/aybabtme/rgbterm", - "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283", - "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam" - } - }, - { - "goPackagePath": "github.com/vaughan0/go-ini", - "fetch": { - "type": "git", - "url": "https://github.com/vaughan0/go-ini", - "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1", - "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4", - "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9" - } - }, - { - "goPackagePath": "github.com/goamz/goamz", - "fetch": { - "type": "git", - "url": "https://github.com/goamz/goamz", - "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7", - "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b" - } - }, - { - "goPackagePath": "github.com/nmcclain/asn1-ber", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "gopkg.in/asn1-ber.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "github.com/peterbourgon/g2s", - "fetch": { - "type": "git", - "url": "https://github.com/peterbourgon/g2s", - "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc", - "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj" - } - }, - { - "goPackagePath": "github.com/nmcclain/ldap", - "fetch": { - "type": "git", - "url": "https://github.com/go-ldap/ldap", - "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29", - "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz" - } - }, - { - "goPackagePath": "github.com/kelseyhightower/memkv", - "fetch": { - "type": "git", - "url": "https://github.com/kelseyhightower/memkv", - "rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580", - "sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540" - } - }, - { - "goPackagePath": "github.com/armon/consul-api", - "fetch": { - "type": "git", - "url": "https://github.com/armon/consul-api", - "rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5", - "sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp" - } - }, - { - "goPackagePath": "github.com/garyburd/redigo", - "fetch": { - "type": "git", - "url": "https://github.com/garyburd/redigo", - "rev": "535138d7bcd717d6531c701ef5933d98b1866257", - "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v" - } - }, - { - "goPackagePath": "github.com/bkaradzic/go-lz4", - "fetch": { - "type": "git", - "url": "https://github.com/bkaradzic/go-lz4", - "rev": "74ddf82598bc4745b965729e9c6a463bedd33049", - "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1" - } - }, - { - "goPackagePath": "github.com/calmh/luhn", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/luhn", - "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632", - "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/vitrun/qart", - "fetch": { - "type": "git", - "url": "https://github.com/vitrun/qart", - "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0", - "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8" - } - }, - { - "goPackagePath": "github.com/calmh/du", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/du", - "rev": "3c0690cca16228b97741327b1b6781397afbdb24", - "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa" - } - }, - { - "goPackagePath": "github.com/calmh/xdr", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/xdr", - "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e", - "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra" - } - }, - { - "goPackagePath": "github.com/juju/ratelimit", - "fetch": { - "type": "git", - "url": "https://github.com/juju/ratelimit", - "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0", - "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p" - } - }, - { - "goPackagePath": "github.com/thejerf/suture", - "fetch": { - "type": "git", - "url": "https://github.com/thejerf/suture", - "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7", - "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy", - "rev": "723cc1e459b8eea2dea4583200fd60757d40097a", - "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h" - } - }, - { - "goPackagePath": "github.com/syndtr/goleveldb", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/goleveldb", - "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0", - "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb" - } - }, - { - "goPackagePath": "github.com/flynn/go-shlex", - "fetch": { - "type": "git", - "url": "https://github.com/flynn/go-shlex", - "rev": "3f9db97f856818214da2e1057f8ad84803971cff", - "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" - } - }, - { - "goPackagePath": "github.com/xenolf/lego", - "fetch": { - "type": "git", - "url": "https://github.com/xenolf/lego", - "rev": "ca19a90028e242e878585941c2a27c8f3b3efc25", - "sha256": "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x" - } - }, - { - "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/natefinch/lumberjack.v2", - "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", - "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "gopkg.in/square/go-jose.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/square/go-jose.v1", - "rev": "40d457b439244b546f023d056628e5184136899b", - "sha256": "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p" - } - }, - { - "goPackagePath": "github.com/mholt/archiver", - "fetch": { - "type": "git", - "url": "https://github.com/mholt/archiver", - "rev": "85f054813ed511646b0ce5e047697e0651b8e1a4", - "sha256": "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0", - "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0" - } - }, - { - "goPackagePath": "github.com/jimstudt/http-authentication", - "fetch": { - "type": "git", - "url": "https://github.com/jimstudt/http-authentication", - "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", - "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "d18b67ae0afd61dae240896eae1785f00709aa31", - "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf" - } - }, - { - "goPackagePath": "github.com/agl/go-gtk", - "fetch": { - "type": "git", - "url": "https://github.com/agl/go-gtk", - "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15", - "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/antonlindstrom/mesos_stats", - "fetch": { - "type": "git", - "url": "https://github.com/antonlindstrom/mesos_stats", - "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920", - "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4" - } - }, - { - "goPackagePath": "github.com/go-sql-driver/mysql", - "fetch": { - "type": "git", - "url": "https://github.com/go-sql-driver/mysql", - "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84", - "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w" - } - }, - { - "goPackagePath": "github.com/prometheus/log", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/log", - "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55", - "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv" - } - }, - { - "goPackagePath": "github.com/soundcloud/go-runit", - "fetch": { - "type": "git", - "url": "https://github.com/soundcloud/go-runit", - "rev": "a9148323a615e2e1c93b7a9893914a360b4945c8", - "sha256": "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v" - } - }, - { - "goPackagePath": "github.com/beevik/ntp", - "fetch": { - "type": "git", - "url": "https://github.com/beevik/ntp", - "rev": "0a5264e2563429030eb922f258229ae3fee5b5dc", - "sha256": "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24" - } - }, - { - "goPackagePath": "github.com/julienschmidt/httprouter", - "fetch": { - "type": "git", - "url": "https://github.com/julienschmidt/httprouter", - "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7", - "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl" - } - }, - { - "goPackagePath": "github.com/howeyc/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6", - "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9" - } - }, - { - "goPackagePath": "github.com/alecthomas/template", - "fetch": { - "type": "git", - "url": "https://github.com/alecthomas/template", - "rev": "14fd436dd20c3cc65242a9f396b61bfc8a3926fc", - "sha256": "19rzvvcgvr1z2wz9xpqsmlm8syizbpxjp5zbzgakvrqlajpbjvx2" - } - }, - { - "goPackagePath": "github.com/alecthomas/units", - "fetch": { - "type": "git", - "url": "https://github.com/alecthomas/units", - "rev": "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a", - "sha256": "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl" - } - }, - { - "goPackagePath": "gopkg.in/alecthomas/kingpin.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/alecthomas/kingpin.v2", - "rev": "21551c2a6259a8145110ca80a36e25c9d7624032", - "sha256": "1zhpqc4qxsw9lc1b4dwk5r42k9r702ihzrabs3mnsphvm9jx4l59" - } - }, - { - "goPackagePath": "github.com/Masterminds/vcs", - "fetch": { - "type": "git", - "url": "https://github.com/Masterminds/vcs", - "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", - "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "957d850b5158a4eebf915476058e720f43459584", - "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf" - } - }, - { - "goPackagePath": "github.com/cheggaaa/pb", - "fetch": { - "type": "git", - "url": "https://github.com/cheggaaa/pb", - "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb", - "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam" - } - }, - { - "goPackagePath": "github.com/odeke-em/cli-spinner", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cli-spinner", - "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33", - "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c" - } - }, - { - "goPackagePath": "github.com/odeke-em/statos", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/statos", - "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6", - "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs" - } - }, - { - "goPackagePath": "github.com/odeke-em/exponential-backoff", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/exponential-backoff", - "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09", - "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6" - } - }, - { - "goPackagePath": "github.com/odeke-em/extractor", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/extractor", - "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4", - "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1" - } - }, - { - "goPackagePath": "github.com/odeke-em/meddler", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/meddler", - "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570", - "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x" - } - }, - { - "goPackagePath": "github.com/odeke-em/xon", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/xon", - "rev": "d580be739d723da4f6378083128f93017b8ab295", - "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc" - } - }, - { - "goPackagePath": "github.com/odeke-em/cache", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cache", - "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb", - "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4" - } - }, - { - "goPackagePath": "github.com/odeke-em/command", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/command", - "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561", - "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62" - } - }, - { - "goPackagePath": "github.com/odeke-em/log", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/log", - "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907", - "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w" - } - }, - { - "goPackagePath": "github.com/odeke-em/pretty-words", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/pretty-words", - "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb", - "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl" - } - }, - { - "goPackagePath": "github.com/skratchdot/open-golang", - "fetch": { - "type": "git", - "url": "https://github.com/skratchdot/open-golang", - "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", - "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft", - "rev": "a8065f298505708bf60f518c09178149f3c06f21", - "sha256": "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft-boltdb", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft-boltdb", - "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", - "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "gopkg.in/fatih/pool.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fatih/pool.v2", - "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", - "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd", - "rev": "cf6dec97343244b5d8a5485463675d42f574aa2d", - "sha256": "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa" - } - }, - { - "goPackagePath": "github.com/monochromegane/conflag", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/conflag", - "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9", - "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-home", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-home", - "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401", - "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww" - } - }, - { - "goPackagePath": "github.com/monochromegane/terminal", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/terminal", - "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48", - "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-gitignore", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-gitignore", - "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729", - "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7" - } - }, - { - "goPackagePath": "github.com/shiena/ansicolor", - "fetch": { - "type": "git", - "url": "https://github.com/shiena/ansicolor", - "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b", - "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p" - } - }, - { - "goPackagePath": "github.com/pquerna/ffjson", - "fetch": { - "type": "git", - "url": "https://github.com/pquerna/ffjson", - "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", - "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" - } - }, - { - "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", - "fetch": { - "type": "git", - "url": "https://gopkg.in/kothar/go-backblaze.v0", - "rev": "373819725fc560fa962c6cd883b533d2ebec4844", - "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" - } - }, - { - "goPackagePath": "github.com/jawher/mow.cli", - "fetch": { - "type": "git", - "url": "https://github.com/jawher/mow.cli", - "rev": "772320464101e904cd51198160eb4d489be9cc49", - "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" - } - }, - { - "goPackagePath": "github.com/svent/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-flags", - "rev": "4bcbad344f0318adaf7aabc16929701459009aa3", - "sha256": "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34" - } - }, - { - "goPackagePath": "github.com/svent/go-nbreader", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-nbreader", - "rev": "7cef48da76dca6a496faa7fe63e39ed665cbd219", - "sha256": "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r" - } - }, - { - "goPackagePath": "github.com/tdewolff/buffer", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/buffer", - "rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5", - "sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl" - } - }, - { - "goPackagePath": "github.com/tdewolff/parse", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/parse", - "rev": "34d5c1160d4503da4b456e5094609f2331d6dde3", - "sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v" - } - }, - { - "goPackagePath": "github.com/tdewolff/strconv", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/strconv", - "rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3", - "sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp" - } - }, - { - "goPackagePath": "github.com/matryer/try", - "fetch": { - "type": "git", - "url": "https://github.com/matryer/try", - "rev": "93d30e50512f879b73829eb79867df38084bcd31", - "sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f" - } - }, - { - "goPackagePath": "github.com/yosssi/ace", - "fetch": { - "type": "git", - "url": "https://github.com/yosssi/ace", - "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d", - "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k" - } - }, - { - "goPackagePath": "github.com/spf13/viper", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/viper", - "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd", - "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0", - "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp" - } - }, - { - "goPackagePath": "github.com/spf13/jwalterweatherman", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/jwalterweatherman", - "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46", - "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/ogier/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/ogier/pflag", - "rev": "45c278ab3607870051a2ea9040bb85fcb8557481", - "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l" - } - }, - { - "goPackagePath": "github.com/magiconair/properties", - "fetch": { - "type": "git", - "url": "https://github.com/magiconair/properties", - "rev": "c265cfa48dda6474e208715ca93e987829f572f8", - "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3" - } - }, - { - "goPackagePath": "github.com/bep/inflect", - "fetch": { - "type": "git", - "url": "https://github.com/bep/inflect", - "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69", - "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3" - } - }, - { - "goPackagePath": "github.com/eknkc/amber", - "fetch": { - "type": "git", - "url": "https://github.com/eknkc/amber", - "rev": "91774f050c1453128146169b626489e60108ec03", - "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis" - } - }, - { - "goPackagePath": "github.com/spf13/afero", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/afero", - "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8", - "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw" - } - }, - { - "goPackagePath": "github.com/spf13/cast", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cast", - "rev": "27b586b42e29bec072fe7379259cc719e1289da6", - "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7", - "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r" - } - }, - { - "goPackagePath": "github.com/dchest/cssmin", - "fetch": { - "type": "git", - "url": "https://github.com/dchest/cssmin", - "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239", - "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s" - } - }, - { - "goPackagePath": "github.com/spf13/fsync", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/fsync", - "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1", - "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p" - } - }, - { - "goPackagePath": "github.com/cpuguy83/go-md2man", - "fetch": { - "type": "git", - "url": "https://github.com/cpuguy83/go-md2man", - "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599", - "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj" - } - }, - { - "goPackagePath": "github.com/miekg/mmark", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/mmark", - "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a", - "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa" - } - }, - { - "goPackagePath": "github.com/spf13/nitro", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/nitro", - "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8", - "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/purell", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/purell", - "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3", - "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb" - } - }, - { - "goPackagePath": "github.com/opennota/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/opennota/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - }, - { - "goPackagePath": "github.com/pkg/sftp", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/sftp", - "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472", - "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/kyokomi/emoji", - "fetch": { - "type": "git", - "url": "https://github.com/kyokomi/emoji", - "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9", - "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp" - } - }, - { - "goPackagePath": "github.com/pkg/errors", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/errors", - "rev": "494e70f7620561491c2ca11e185bbef4b70060da", - "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - } -] diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5faceef8573..7cba0d1599f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -25,6 +25,9 @@ self: super: { statistics = dontCheck super.statistics; c2hs = if pkgs.stdenv.isDarwin then dontCheck super.c2hs else super.c2hs; + # This test keeps being aborted because it runs too quietly for too long + Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; + # Use the default version of mysql to build this package (which is actually mariadb). mysql = super.mysql.override { mysql = pkgs.mysql.lib; }; @@ -836,6 +839,9 @@ self: super: { # https://github.com/guillaume-nargeot/hpc-coveralls/issues/52 hpc-coveralls = disableSharedExecutables super.hpc-coveralls; + # Can't find libHSidris-*.so during build. + idris = disableSharedExecutables super.idris; + # https://github.com/fpco/stackage/issues/838 cryptonite = dontCheck super.cryptonite; @@ -936,33 +942,12 @@ self: super: { ''; }); - # libmpd has an upper-bound on time which doesn't seem to be a real build req - libmpd = dontCheck (overrideCabal super.libmpd (drv: { - postPatch = (drv.postPatch or "") + '' - substituteInPlace libmpd.cabal --replace "time >=1.5 && <1.6" "time >=1.5" - ''; - })); - # https://github.com/commercialhaskell/stack/issues/2263 stack = appendPatch super.stack (pkgs.fetchpatch { url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; }); - # https://github.com/GaloisInc/HaNS/pull/12 - hans = overrideCabal super.hans (drv: { - src = pkgs.fetchFromGitHub { - owner = "GaloisInc"; - repo = "HaNS"; - rev = "53e4af3ee46fc06b31754cec620209a81bbef456"; - sha256 = "079205fqglzhh931h4n7qlrih18117m3w82ih19b8ygr55ps4ldj"; - }; - doHaddock = false; - patches = [(pkgs.fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/GaloisInc/HaNS/pull/12.patch"; - sha256 = "0xa5b7i9wx32ji0zzlh1a1pws677iffby3bg39kv3c9srdb4by1g"; - })]; - }); # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index cef032ff2e7..aebbf4934b6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -63,6 +63,10 @@ self: super: { nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; + hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; }); + + yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; }); + # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; @@ -134,7 +138,6 @@ self: super: { timezone-series = doJailbreak super.timezone-series; timezone-olson = doJailbreak super.timezone-olson; - libmpd = dontCheck super.libmpd; xmonad-extras = overrideCabal super.xmonad-extras (drv: { postPatch = '' sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs @@ -202,6 +205,7 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. + aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale"; aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; case-insensitive = addBuildDepend super.case-insensitive self.semigroups; bytes = addBuildDepend super.bytes self.doctest; @@ -209,7 +213,7 @@ self: super: { semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]); intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); - Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]); + Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]); # cereal must have `fail` in pre-ghc-8.0.x versions # also tests require bytestring>=0.10.8.1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2328e9f34cc..860ed1fec0c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -43,13 +43,11 @@ extra-packages: - containers < 0.5 # required to build alex with GHC 6.12.3 - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - - descriptive < 0.1 # required for structured-haskell-mode-1.0.8 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x - - haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 @@ -4264,7 +4262,6 @@ dont-distribute-packages: structs: [ i686-linux, x86_64-linux ] structural-induction: [ i686-linux, x86_64-linux ] structural-traversal: [ i686-linux, x86_64-linux ] - structured-haskell-mode: [ i686-linux, x86_64-linux ] structured-mongoDB: [ i686-linux, x86_64-linux ] structures: [ i686-linux, x86_64-linux ] stunts: [ i686-linux, x86_64-darwin, x86_64-linux ] diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 3acc98754ec..bcebd87d40a 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -357,6 +357,7 @@ self: super: { "GiST" = dontDistribute super."GiST"; "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; + "Glob" = doDistribute super."Glob_0_7_10"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; "GlomeView" = dontDistribute super."GlomeView"; @@ -619,6 +620,8 @@ self: super: { "MazesOfMonad" = dontDistribute super."MazesOfMonad"; "MeanShift" = dontDistribute super."MeanShift"; "Measure" = dontDistribute super."Measure"; + "Mecha" = dontDistribute super."Mecha"; + "Mechs" = dontDistribute super."Mechs"; "MetaHDBC" = dontDistribute super."MetaHDBC"; "MetaObject" = dontDistribute super."MetaObject"; "Metrics" = dontDistribute super."Metrics"; @@ -699,6 +702,7 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; + "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_1_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -910,6 +914,7 @@ self: super: { "Top" = dontDistribute super."Top"; "Tournament" = dontDistribute super."Tournament"; "TraceUtils" = dontDistribute super."TraceUtils"; + "TransformeR" = dontDistribute super."TransformeR"; "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; "Transhare" = dontDistribute super."Transhare"; "TreeCounter" = dontDistribute super."TreeCounter"; @@ -983,6 +988,7 @@ self: super: { "X11-xshape" = dontDistribute super."X11-xshape"; "XAttr" = dontDistribute super."XAttr"; "XInput" = dontDistribute super."XInput"; + "XMLParser" = dontDistribute super."XMLParser"; "XMMS" = dontDistribute super."XMMS"; "XMPP" = dontDistribute super."XMPP"; "XSaiga" = dontDistribute super."XSaiga"; @@ -1050,6 +1056,7 @@ self: super: { "acme-http" = dontDistribute super."acme-http"; "acme-inator" = dontDistribute super."acme-inator"; "acme-io" = dontDistribute super."acme-io"; + "acme-iot" = dontDistribute super."acme-iot"; "acme-left-pad" = dontDistribute super."acme-left-pad"; "acme-lolcat" = dontDistribute super."acme-lolcat"; "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; @@ -1088,6 +1095,7 @@ self: super: { "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; "adp-multi" = dontDistribute super."adp-multi"; "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; + "aeson" = doDistribute super."aeson_0_11_2_0"; "aeson-applicative" = dontDistribute super."aeson-applicative"; "aeson-bson" = dontDistribute super."aeson-bson"; "aeson-coerce" = dontDistribute super."aeson-coerce"; @@ -1143,6 +1151,7 @@ self: super: { "algebra-sql" = dontDistribute super."algebra-sql"; "algebraic" = dontDistribute super."algebraic"; "algebraic-classes" = dontDistribute super."algebraic-classes"; + "algo-s" = dontDistribute super."algo-s"; "align" = dontDistribute super."align"; "align-text" = dontDistribute super."align-text"; "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; @@ -1224,6 +1233,7 @@ self: super: { "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; "arb-fft" = dontDistribute super."arb-fft"; "arbb-vm" = dontDistribute super."arbb-vm"; + "arbtt" = doDistribute super."arbtt_0_9_0_9"; "archive" = dontDistribute super."archive"; "archiver" = dontDistribute super."archiver"; "archlinux" = dontDistribute super."archlinux"; @@ -1261,6 +1271,7 @@ self: super: { "ascii-table" = dontDistribute super."ascii-table"; "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; "ascii85-conduit" = dontDistribute super."ascii85-conduit"; + "asciidiagram" = doDistribute super."asciidiagram_1_3_1_1"; "asic" = dontDistribute super."asic"; "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; @@ -1660,6 +1671,7 @@ self: super: { "c10k" = dontDistribute super."c10k"; "c2hsc" = dontDistribute super."c2hsc"; "cab" = dontDistribute super."cab"; + "cabal" = dontDistribute super."cabal"; "cabal-audit" = dontDistribute super."cabal-audit"; "cabal-bounds" = dontDistribute super."cabal-bounds"; "cabal-cargs" = dontDistribute super."cabal-cargs"; @@ -1736,6 +1748,7 @@ self: super: { "canteven-http" = dontDistribute super."canteven-http"; "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; + "canteven-parsedate" = dontDistribute super."canteven-parsedate"; "canteven-template" = dontDistribute super."canteven-template"; "cantor" = dontDistribute super."cantor"; "cao" = dontDistribute super."cao"; @@ -1746,6 +1759,7 @@ self: super: { "caramia" = dontDistribute super."caramia"; "carboncopy" = dontDistribute super."carboncopy"; "carettah" = dontDistribute super."carettah"; + "carray" = doDistribute super."carray_0_1_6_4"; "cartel" = doDistribute super."cartel_0_16_0_0"; "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; "casadi-bindings" = dontDistribute super."casadi-bindings"; @@ -1925,6 +1939,7 @@ self: super: { "codecov-haskell" = dontDistribute super."codecov-haskell"; "codemonitor" = dontDistribute super."codemonitor"; "codepad" = dontDistribute super."codepad"; + "codeworld-api" = dontDistribute super."codeworld-api"; "codex" = doDistribute super."codex_0_4_0_10"; "codo-notation" = dontDistribute super."codo-notation"; "cofunctor" = dontDistribute super."cofunctor"; @@ -2007,6 +2022,7 @@ self: super: { "conductive-clock" = dontDistribute super."conductive-clock"; "conductive-hsc3" = dontDistribute super."conductive-hsc3"; "conductive-song" = dontDistribute super."conductive-song"; + "conduit" = doDistribute super."conduit_1_2_6_6"; "conduit-audio" = dontDistribute super."conduit-audio"; "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; @@ -2028,6 +2044,7 @@ self: super: { "conjugateGradient" = dontDistribute super."conjugateGradient"; "conjure" = dontDistribute super."conjure"; "conlogger" = dontDistribute super."conlogger"; + "connection" = doDistribute super."connection_0_2_5"; "connection-pool" = dontDistribute super."connection-pool"; "consistent" = dontDistribute super."consistent"; "console-program" = dontDistribute super."console-program"; @@ -2049,6 +2066,7 @@ self: super: { "continue" = dontDistribute super."continue"; "continuum" = dontDistribute super."continuum"; "continuum-client" = dontDistribute super."continuum-client"; + "contravariant-extras" = doDistribute super."contravariant-extras_0_3_2"; "control-event" = dontDistribute super."control-event"; "control-monad-attempt" = dontDistribute super."control-monad-attempt"; "control-monad-exception" = dontDistribute super."control-monad-exception"; @@ -2125,6 +2143,8 @@ self: super: { "crc16" = dontDistribute super."crc16"; "crc16-table" = dontDistribute super."crc16-table"; "creatur" = dontDistribute super."creatur"; + "credentials" = dontDistribute super."credentials"; + "credentials-cli" = dontDistribute super."credentials-cli"; "crf-chain1" = dontDistribute super."crf-chain1"; "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; @@ -2182,6 +2202,7 @@ self: super: { "curl-aeson" = dontDistribute super."curl-aeson"; "curlhs" = dontDistribute super."curlhs"; "currency" = dontDistribute super."currency"; + "currency-convert" = dontDistribute super."currency-convert"; "current-locale" = dontDistribute super."current-locale"; "curry-base" = dontDistribute super."curry-base"; "curry-frontend" = dontDistribute super."curry-frontend"; @@ -2321,9 +2342,11 @@ self: super: { "datetime-sb" = dontDistribute super."datetime-sb"; "dawdle" = dontDistribute super."dawdle"; "dawg" = dontDistribute super."dawg"; + "dawg-ord" = doDistribute super."dawg-ord_0_5_0_1"; "dbcleaner" = dontDistribute super."dbcleaner"; "dbf" = dontDistribute super."dbf"; "dbjava" = dontDistribute super."dbjava"; + "dbm" = dontDistribute super."dbm"; "dbus-client" = dontDistribute super."dbus-client"; "dbus-core" = dontDistribute super."dbus-core"; "dbus-qq" = dontDistribute super."dbus-qq"; @@ -2391,6 +2414,7 @@ self: super: { "dependent-state" = dontDistribute super."dependent-state"; "depends" = dontDistribute super."depends"; "dephd" = dontDistribute super."dephd"; + "deque" = dontDistribute super."deque"; "dequeue" = dontDistribute super."dequeue"; "derangement" = dontDistribute super."derangement"; "derivation-trees" = dontDistribute super."derivation-trees"; @@ -2404,6 +2428,7 @@ self: super: { "derp" = dontDistribute super."derp"; "derp-lib" = dontDistribute super."derp-lib"; "descrilo" = dontDistribute super."descrilo"; + "desert" = dontDistribute super."desert"; "despair" = dontDistribute super."despair"; "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; "detrospector" = dontDistribute super."detrospector"; @@ -2417,12 +2442,17 @@ self: super: { "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; "diagrams-boolean" = dontDistribute super."diagrams-boolean"; + "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_1"; + "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_5"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_6"; + "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_3"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_7"; "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_10"; @@ -2439,9 +2469,11 @@ self: super: { "diffarray" = dontDistribute super."diffarray"; "diffcabal" = dontDistribute super."diffcabal"; "diffdump" = dontDistribute super."diffdump"; + "difftodo" = dontDistribute super."difftodo"; "digamma" = dontDistribute super."digamma"; "digest-pure" = dontDistribute super."digest-pure"; "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; + "digestive-functors" = doDistribute super."digestive-functors_0_8_0_1"; "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; @@ -2595,6 +2627,7 @@ self: super: { "ed25519" = dontDistribute super."ed25519"; "ed25519-donna" = dontDistribute super."ed25519-donna"; "eddie" = dontDistribute super."eddie"; + "ede" = doDistribute super."ede_0_2_8_4"; "edenmodules" = dontDistribute super."edenmodules"; "edenskel" = dontDistribute super."edenskel"; "edentv" = dontDistribute super."edentv"; @@ -2624,6 +2657,7 @@ self: super: { "ekg-log" = dontDistribute super."ekg-log"; "ekg-push" = dontDistribute super."ekg-push"; "ekg-rrd" = dontDistribute super."ekg-rrd"; + "ekg-statsd" = doDistribute super."ekg-statsd_0_2_0_4"; "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; "elerea" = dontDistribute super."elerea"; "elerea-examples" = dontDistribute super."elerea-examples"; @@ -2651,6 +2685,7 @@ self: super: { "email-postmark" = dontDistribute super."email-postmark"; "email-validate-json" = dontDistribute super."email-validate-json"; "email-validator" = dontDistribute super."email-validator"; + "emailaddress" = dontDistribute super."emailaddress"; "emailparse" = dontDistribute super."emailparse"; "embeddock" = dontDistribute super."embeddock"; "embeddock-example" = dontDistribute super."embeddock-example"; @@ -2659,6 +2694,7 @@ self: super: { "empty" = dontDistribute super."empty"; "enchant" = dontDistribute super."enchant"; "encoding" = dontDistribute super."encoding"; + "encoding-io" = dontDistribute super."encoding-io"; "endo" = dontDistribute super."endo"; "engine-io-growler" = dontDistribute super."engine-io-growler"; "engine-io-snap" = dontDistribute super."engine-io-snap"; @@ -2676,6 +2712,7 @@ self: super: { "env-locale" = dontDistribute super."env-locale"; "env-parser" = dontDistribute super."env-parser"; "envparse" = dontDistribute super."envparse"; + "envy" = doDistribute super."envy_1_1_0_0"; "epanet-haskell" = dontDistribute super."epanet-haskell"; "epass" = dontDistribute super."epass"; "epic" = dontDistribute super."epic"; @@ -2747,6 +2784,7 @@ self: super: { "exp-pairs" = dontDistribute super."exp-pairs"; "expand" = dontDistribute super."expand"; "expat-enumerator" = dontDistribute super."expat-enumerator"; + "expiring-cache-map" = doDistribute super."expiring-cache-map_0_0_5_4"; "expiring-mvar" = dontDistribute super."expiring-mvar"; "explain" = dontDistribute super."explain"; "explicit-determinant" = dontDistribute super."explicit-determinant"; @@ -2789,6 +2827,7 @@ self: super: { "fastcgi" = dontDistribute super."fastcgi"; "fastedit" = dontDistribute super."fastedit"; "fastirc" = dontDistribute super."fastirc"; + "fathead-util" = dontDistribute super."fathead-util"; "fault-tree" = dontDistribute super."fault-tree"; "fay-geoposition" = dontDistribute super."fay-geoposition"; "fay-hsx" = dontDistribute super."fay-hsx"; @@ -2821,6 +2860,7 @@ self: super: { "fficxx-runtime" = dontDistribute super."fficxx-runtime"; "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; + "fft" = doDistribute super."fft_0_1_8_3"; "fftwRaw" = dontDistribute super."fftwRaw"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; @@ -2833,6 +2873,7 @@ self: super: { "file-collection" = dontDistribute super."file-collection"; "file-command-qq" = dontDistribute super."file-command-qq"; "file-embed-poly" = dontDistribute super."file-embed-poly"; + "file-modules" = doDistribute super."file-modules_0_1_2_3"; "filediff" = dontDistribute super."filediff"; "filepath-io-access" = dontDistribute super."filepath-io-access"; "filepather" = dontDistribute super."filepather"; @@ -2936,6 +2977,8 @@ self: super: { "foscam-directory" = dontDistribute super."foscam-directory"; "foscam-filename" = dontDistribute super."foscam-filename"; "foscam-sort" = dontDistribute super."foscam-sort"; + "foundation" = dontDistribute super."foundation"; + "foundation-edge" = dontDistribute super."foundation-edge"; "fountain" = dontDistribute super."fountain"; "fpco-api" = dontDistribute super."fpco-api"; "fpipe" = dontDistribute super."fpipe"; @@ -3039,6 +3082,7 @@ self: super: { "gbu" = dontDistribute super."gbu"; "gc" = dontDistribute super."gc"; "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; + "gcodehs" = dontDistribute super."gcodehs"; "gconf" = dontDistribute super."gconf"; "gdiff" = dontDistribute super."gdiff"; "gdiff-ig" = dontDistribute super."gdiff-ig"; @@ -3123,6 +3167,8 @@ self: super: { "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; + "ghc-typelits-knownnat" = dontDistribute super."ghc-typelits-knownnat"; + "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_6"; "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; @@ -3131,6 +3177,7 @@ self: super: { "ghci-lib" = dontDistribute super."ghci-lib"; "ghci-ng" = dontDistribute super."ghci-ng"; "ghci-pretty" = dontDistribute super."ghci-pretty"; + "ghcid" = doDistribute super."ghcid_0_6_4"; "ghcjs-ajax" = dontDistribute super."ghcjs-ajax"; "ghcjs-dom" = doDistribute super."ghcjs-dom_0_2_4_0"; "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; @@ -3197,6 +3244,7 @@ self: super: { "gitter" = dontDistribute super."gitter"; "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; + "glabrous" = dontDistribute super."glabrous"; "glade" = dontDistribute super."glade"; "gladexml-accessor" = dontDistribute super."gladexml-accessor"; "glambda" = dontDistribute super."glambda"; @@ -3533,6 +3581,7 @@ self: super: { "haddock-leksah" = dontDistribute super."haddock-leksah"; "haddock-library" = doDistribute super."haddock-library_1_2_1"; "haddock-test" = dontDistribute super."haddock-test"; + "haddocset" = doDistribute super."haddocset_0_4_1"; "hadoop-formats" = dontDistribute super."hadoop-formats"; "hadoop-rpc" = dontDistribute super."hadoop-rpc"; "hadoop-tools" = dontDistribute super."hadoop-tools"; @@ -3631,6 +3680,7 @@ self: super: { "has-th" = dontDistribute super."has-th"; "hascal" = dontDistribute super."hascal"; "hascar" = dontDistribute super."hascar"; + "hascas" = dontDistribute super."hascas"; "hascat" = dontDistribute super."hascat"; "hascat-lib" = dontDistribute super."hascat-lib"; "hascat-setup" = dontDistribute super."hascat-setup"; @@ -3666,6 +3716,7 @@ self: super: { "haskell-compression" = dontDistribute super."haskell-compression"; "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; "haskell-docs" = dontDistribute super."haskell-docs"; + "haskell-eigen-util" = dontDistribute super."haskell-eigen-util"; "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent"; "haskell-formatter" = dontDistribute super."haskell-formatter"; @@ -3674,6 +3725,7 @@ self: super: { "haskell-gi" = doDistribute super."haskell-gi_0_17_4"; "haskell-gi-base" = doDistribute super."haskell-gi-base_0_17"; "haskell-google-trends" = dontDistribute super."haskell-google-trends"; + "haskell-igraph" = dontDistribute super."haskell-igraph"; "haskell-import-graph" = dontDistribute super."haskell-import-graph"; "haskell-in-space" = dontDistribute super."haskell-in-space"; "haskell-kubernetes" = dontDistribute super."haskell-kubernetes"; @@ -3692,6 +3744,7 @@ self: super: { "haskell-read-editor" = dontDistribute super."haskell-read-editor"; "haskell-reflect" = dontDistribute super."haskell-reflect"; "haskell-rules" = dontDistribute super."haskell-rules"; + "haskell-src-exts-prisms" = dontDistribute super."haskell-src-exts-prisms"; "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; "haskell-src-exts-simple" = dontDistribute super."haskell-src-exts-simple"; "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; @@ -3762,6 +3815,7 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; + "hasql" = doDistribute super."hasql_0_19_14"; "hasql-backend" = dontDistribute super."hasql-backend"; "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction"; @@ -3781,11 +3835,13 @@ self: super: { "hat" = dontDistribute super."hat"; "hatex-guide" = dontDistribute super."hatex-guide"; "hath" = dontDistribute super."hath"; + "hats" = dontDistribute super."hats"; "hatt" = dontDistribute super."hatt"; "haverer" = dontDistribute super."haverer"; "hawitter" = dontDistribute super."hawitter"; "haxl-facebook" = dontDistribute super."haxl-facebook"; "haxparse" = dontDistribute super."haxparse"; + "haxr" = doDistribute super."haxr_3000_11_1_6"; "haxr-th" = dontDistribute super."haxr-th"; "haxy" = dontDistribute super."haxy"; "hayland" = dontDistribute super."hayland"; @@ -3819,6 +3875,7 @@ self: super: { "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; "hdbi-tests" = dontDistribute super."hdbi-tests"; + "hdevtools" = doDistribute super."hdevtools_0_1_3_2"; "hdf" = dontDistribute super."hdf"; "hdigest" = dontDistribute super."hdigest"; "hdirect" = dontDistribute super."hdirect"; @@ -3842,6 +3899,7 @@ self: super: { "hedis-tags" = dontDistribute super."hedis-tags"; "hedn" = dontDistribute super."hedn"; "hein" = dontDistribute super."hein"; + "heist" = doDistribute super."heist_0_14_1_4"; "heist-aeson" = dontDistribute super."heist-aeson"; "heist-async" = dontDistribute super."heist-async"; "helics" = dontDistribute super."helics"; @@ -4089,6 +4147,7 @@ self: super: { "hp2any-manager" = dontDistribute super."hp2any-manager"; "hp2html" = dontDistribute super."hp2html"; "hp2pretty" = dontDistribute super."hp2pretty"; + "hpack-convert" = dontDistribute super."hpack-convert"; "hpaco" = dontDistribute super."hpaco"; "hpaco-lib" = dontDistribute super."hpaco-lib"; "hpage" = dontDistribute super."hpage"; @@ -4150,6 +4209,7 @@ self: super: { "hs-twitter" = dontDistribute super."hs-twitter"; "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; "hs-vcard" = dontDistribute super."hs-vcard"; + "hs-watchman" = dontDistribute super."hs-watchman"; "hs2048" = dontDistribute super."hs2048"; "hs2bf" = dontDistribute super."hs2bf"; "hs2dot" = dontDistribute super."hs2dot"; @@ -4236,12 +4296,15 @@ self: super: { "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; "hspec-experimental" = dontDistribute super."hspec-experimental"; + "hspec-golden-aeson" = dontDistribute super."hspec-golden-aeson"; + "hspec-hashable" = dontDistribute super."hspec-hashable"; "hspec-laws" = dontDistribute super."hspec-laws"; "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; "hspec-monad-control" = dontDistribute super."hspec-monad-control"; "hspec-server" = dontDistribute super."hspec-server"; "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; "hspec-slow" = dontDistribute super."hspec-slow"; + "hspec-snap" = doDistribute super."hspec-snap_0_4_0_1"; "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; "hspec-test-framework" = dontDistribute super."hspec-test-framework"; @@ -4266,6 +4329,7 @@ self: super: { "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; "hsqml-morris" = dontDistribute super."hsqml-morris"; "hsreadability" = dontDistribute super."hsreadability"; + "hsrelp" = dontDistribute super."hsrelp"; "hsseccomp" = dontDistribute super."hsseccomp"; "hsshellscript" = dontDistribute super."hsshellscript"; "hssourceinfo" = dontDistribute super."hssourceinfo"; @@ -4289,6 +4353,7 @@ self: super: { "hszephyr" = dontDistribute super."hszephyr"; "htags" = dontDistribute super."htags"; "htar" = dontDistribute super."htar"; + "htestu" = dontDistribute super."htestu"; "htiled" = dontDistribute super."htiled"; "htime" = dontDistribute super."htime"; "html-email-validate" = dontDistribute super."html-email-validate"; @@ -4333,6 +4398,7 @@ self: super: { "http-test" = dontDistribute super."http-test"; "http-trace" = dontDistribute super."http-trace"; "http-wget" = dontDistribute super."http-wget"; + "http2" = doDistribute super."http2_1_6_1"; "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; "httpspec" = dontDistribute super."httpspec"; @@ -4362,6 +4428,7 @@ self: super: { "huttons-razor" = dontDistribute super."huttons-razor"; "huzzy" = dontDistribute super."huzzy"; "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; + "hw-diagnostics" = doDistribute super."hw-diagnostics_0_0_0_2"; "hw-json" = doDistribute super."hw-json_0_0_0_2"; "hw-mquery" = dontDistribute super."hw-mquery"; "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; @@ -4427,6 +4494,7 @@ self: super: { "idiii" = dontDistribute super."idiii"; "idna" = dontDistribute super."idna"; "idna2008" = dontDistribute super."idna2008"; + "idringen" = dontDistribute super."idringen"; "idris" = doDistribute super."idris_0_11_2"; "ieee" = dontDistribute super."ieee"; "ieee-utils" = dontDistribute super."ieee-utils"; @@ -4467,6 +4535,7 @@ self: super: { "impure-containers" = dontDistribute super."impure-containers"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; + "inchworm" = dontDistribute super."inchworm"; "incremental-computing" = dontDistribute super."incremental-computing"; "incremental-maps" = dontDistribute super."incremental-maps"; "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; @@ -4538,6 +4607,7 @@ self: super: { "invertible-syntax" = dontDistribute super."invertible-syntax"; "io-capture" = dontDistribute super."io-capture"; "io-reactive" = dontDistribute super."io-reactive"; + "io-streams-haproxy" = dontDistribute super."io-streams-haproxy"; "io-streams-http" = dontDistribute super."io-streams-http"; "io-throttle" = dontDistribute super."io-throttle"; "ioctl" = dontDistribute super."ioctl"; @@ -4682,9 +4752,11 @@ self: super: { "jukebox" = dontDistribute super."jukebox"; "jump" = dontDistribute super."jump"; "jumpthefive" = dontDistribute super."jumpthefive"; + "jupyter" = dontDistribute super."jupyter"; "jvm-parser" = dontDistribute super."jvm-parser"; "kademlia" = dontDistribute super."kademlia"; "kafka-client" = dontDistribute super."kafka-client"; + "kaleidoscope" = dontDistribute super."kaleidoscope"; "kan-extensions" = doDistribute super."kan-extensions_4_2_3"; "kangaroo" = dontDistribute super."kangaroo"; "kansas-lava" = dontDistribute super."kansas-lava"; @@ -4721,7 +4793,9 @@ self: super: { "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; "keera-posture" = dontDistribute super."keera-posture"; "keiretsu" = dontDistribute super."keiretsu"; + "keter" = doDistribute super."keter_1_4_3_1"; "kevin" = dontDistribute super."kevin"; + "keycode" = doDistribute super."keycode_0_2"; "keyed" = dontDistribute super."keyed"; "keyring" = dontDistribute super."keyring"; "keystore" = dontDistribute super."keystore"; @@ -4752,6 +4826,7 @@ self: super: { "l-bfgs-b" = dontDistribute super."l-bfgs-b"; "labeled-graph" = dontDistribute super."labeled-graph"; "labeled-tree" = dontDistribute super."labeled-tree"; + "labels" = dontDistribute super."labels"; "laborantin-hs" = dontDistribute super."laborantin-hs"; "labyrinth" = dontDistribute super."labyrinth"; "labyrinth-server" = dontDistribute super."labyrinth-server"; @@ -4799,8 +4874,10 @@ self: super: { "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; "language-cil" = dontDistribute super."language-cil"; + "language-conf" = dontDistribute super."language-conf"; "language-css" = dontDistribute super."language-css"; "language-dart" = dontDistribute super."language-dart"; + "language-dockerfile" = dontDistribute super."language-dockerfile"; "language-dot" = dontDistribute super."language-dot"; "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; "language-eiffel" = dontDistribute super."language-eiffel"; @@ -4808,6 +4885,7 @@ self: super: { "language-gcl" = dontDistribute super."language-gcl"; "language-go" = dontDistribute super."language-go"; "language-guess" = dontDistribute super."language-guess"; + "language-hcl" = dontDistribute super."language-hcl"; "language-java-classfile" = dontDistribute super."language-java-classfile"; "language-kort" = dontDistribute super."language-kort"; "language-lua" = dontDistribute super."language-lua"; @@ -4829,6 +4907,7 @@ self: super: { "language-typescript" = dontDistribute super."language-typescript"; "language-vhdl" = dontDistribute super."language-vhdl"; "language-webidl" = dontDistribute super."language-webidl"; + "large-hashable" = dontDistribute super."large-hashable"; "lat" = dontDistribute super."lat"; "latest-npm-version" = dontDistribute super."latest-npm-version"; "latex" = dontDistribute super."latex"; @@ -4902,6 +4981,7 @@ self: super: { "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; "libltdl" = dontDistribute super."libltdl"; "libmpd" = dontDistribute super."libmpd"; + "libnotify" = doDistribute super."libnotify_0_1_1_0"; "libnvvm" = dontDistribute super."libnvvm"; "liboleg" = dontDistribute super."liboleg"; "libpafe" = dontDistribute super."libpafe"; @@ -4920,6 +5000,8 @@ self: super: { "libxml" = dontDistribute super."libxml"; "libxml-enumerator" = dontDistribute super."libxml-enumerator"; "libxslt" = dontDistribute super."libxslt"; + "libzfs" = dontDistribute super."libzfs"; + "licensor" = dontDistribute super."licensor"; "life" = dontDistribute super."life"; "lifted-protolude" = dontDistribute super."lifted-protolude"; "lifted-threads" = dontDistribute super."lifted-threads"; @@ -4969,6 +5051,7 @@ self: super: { "lio-fs" = dontDistribute super."lio-fs"; "lio-simple" = dontDistribute super."lio-simple"; "lipsum-gen" = dontDistribute super."lipsum-gen"; + "liquid" = dontDistribute super."liquid"; "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; "liquidhaskell" = dontDistribute super."liquidhaskell"; "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal"; @@ -4978,6 +5061,7 @@ self: super: { "list-grouping" = dontDistribute super."list-grouping"; "list-mux" = dontDistribute super."list-mux"; "list-remote-forwards" = dontDistribute super."list-remote-forwards"; + "list-t" = doDistribute super."list-t_0_4_7"; "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; "list-t-html-parser" = dontDistribute super."list-t-html-parser"; "list-t-http-client" = dontDistribute super."list-t-http-client"; @@ -5060,6 +5144,7 @@ self: super: { "lowgl" = dontDistribute super."lowgl"; "lp-diagrams" = dontDistribute super."lp-diagrams"; "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; + "lrucaching" = dontDistribute super."lrucaching"; "ls-usb" = dontDistribute super."ls-usb"; "lscabal" = dontDistribute super."lscabal"; "lss" = dontDistribute super."lss"; @@ -5134,11 +5219,13 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; + "mandrill" = doDistribute super."mandrill_0_5_2_2"; "mandulia" = dontDistribute super."mandulia"; "mangopay" = dontDistribute super."mangopay"; "manifold-random" = dontDistribute super."manifold-random"; "manifolds" = dontDistribute super."manifolds"; "map-exts" = dontDistribute super."map-exts"; + "map-syntax" = doDistribute super."map-syntax_0_2"; "mappy" = dontDistribute super."mappy"; "marionetta" = dontDistribute super."marionetta"; "markdown-kate" = dontDistribute super."markdown-kate"; @@ -5151,6 +5238,7 @@ self: super: { "markup-preview" = dontDistribute super."markup-preview"; "marmalade-upload" = dontDistribute super."marmalade-upload"; "marquise" = dontDistribute super."marquise"; + "mars" = dontDistribute super."mars"; "marxup" = dontDistribute super."marxup"; "masakazu-bot" = dontDistribute super."masakazu-bot"; "mastermind" = dontDistribute super."mastermind"; @@ -5182,7 +5270,9 @@ self: super: { "mdp" = dontDistribute super."mdp"; "means" = dontDistribute super."means"; "mecab" = dontDistribute super."mecab"; + "mech" = dontDistribute super."mech"; "mecha" = dontDistribute super."mecha"; + "mechs" = dontDistribute super."mechs"; "mediawiki" = dontDistribute super."mediawiki"; "mediawiki2latex" = dontDistribute super."mediawiki2latex"; "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; @@ -5221,10 +5311,12 @@ self: super: { "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; "microlens" = doDistribute super."microlens_0_4_5_0"; + "microlens-aeson" = doDistribute super."microlens-aeson_2_1_1"; "microlens-each" = dontDistribute super."microlens-each"; "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0"; "microlens-mtl" = doDistribute super."microlens-mtl_0_1_9_0"; "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0"; + "microlens-th" = doDistribute super."microlens-th_0_4_0_0"; "micrologger" = dontDistribute super."micrologger"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -5232,6 +5324,7 @@ self: super: { "midi-alsa" = dontDistribute super."midi-alsa"; "midi-music-box" = dontDistribute super."midi-music-box"; "midi-util" = dontDistribute super."midi-util"; + "midi-utils" = dontDistribute super."midi-utils"; "midimory" = dontDistribute super."midimory"; "midisurface" = dontDistribute super."midisurface"; "mighttpd" = dontDistribute super."mighttpd"; @@ -5386,6 +5479,7 @@ self: super: { "mtgoxapi" = dontDistribute super."mtgoxapi"; "mtl-c" = dontDistribute super."mtl-c"; "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; + "mtl-extras" = dontDistribute super."mtl-extras"; "mtl-tf" = dontDistribute super."mtl-tf"; "mtl-unleashed" = dontDistribute super."mtl-unleashed"; "mtlparse" = dontDistribute super."mtlparse"; @@ -5432,6 +5526,7 @@ self: super: { "musicbrainz-email" = dontDistribute super."musicbrainz-email"; "musicxml" = dontDistribute super."musicxml"; "musicxml2" = dontDistribute super."musicxml2"; + "mustache" = doDistribute super."mustache_1_0_2"; "mustache-haskell" = dontDistribute super."mustache-haskell"; "mustache2hs" = dontDistribute super."mustache2hs"; "mutable-iter" = dontDistribute super."mutable-iter"; @@ -5446,6 +5541,7 @@ self: super: { "mysnapsession" = dontDistribute super."mysnapsession"; "mysnapsession-example" = dontDistribute super."mysnapsession-example"; "mysql-effect" = dontDistribute super."mysql-effect"; + "mysql-haskell" = dontDistribute super."mysql-haskell"; "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; "mystem" = dontDistribute super."mystem"; @@ -5592,6 +5688,7 @@ self: super: { "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; "noodle" = dontDistribute super."noodle"; "normaldistribution" = dontDistribute super."normaldistribution"; + "normalization-insensitive" = dontDistribute super."normalization-insensitive"; "not-gloss" = dontDistribute super."not-gloss"; "not-gloss-examples" = dontDistribute super."not-gloss-examples"; "not-in-base" = dontDistribute super."not-in-base"; @@ -5751,6 +5848,7 @@ self: super: { "pagarme" = dontDistribute super."pagarme"; "pagination" = dontDistribute super."pagination"; "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; + "palette" = doDistribute super."palette_0_1_0_3"; "palindromes" = dontDistribute super."palindromes"; "pam" = dontDistribute super."pam"; "panda" = dontDistribute super."panda"; @@ -5915,6 +6013,7 @@ self: super: { "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; "pinch" = doDistribute super."pinch_0_2_0_2"; + "pinchot" = doDistribute super."pinchot_0_18_2_0"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -6032,6 +6131,7 @@ self: super: { "possible" = dontDistribute super."possible"; "postcodes" = dontDistribute super."postcodes"; "postgres-tmp" = dontDistribute super."postgres-tmp"; + "postgresql-binary" = doDistribute super."postgresql-binary_0_9_0_1"; "postgresql-config" = dontDistribute super."postgresql-config"; "postgresql-connector" = dontDistribute super."postgresql-connector"; "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; @@ -6063,6 +6163,7 @@ self: super: { "prednote-test" = dontDistribute super."prednote-test"; "prefork" = dontDistribute super."prefork"; "pregame" = dontDistribute super."pregame"; + "preliminaries" = dontDistribute super."preliminaries"; "prelude-compat" = dontDistribute super."prelude-compat"; "prelude-edsl" = dontDistribute super."prelude-edsl"; "prelude-generalize" = dontDistribute super."prelude-generalize"; @@ -6079,6 +6180,7 @@ self: super: { "pretty-ncols" = dontDistribute super."pretty-ncols"; "pretty-sop" = dontDistribute super."pretty-sop"; "pretty-tree" = dontDistribute super."pretty-tree"; + "pretty-types" = dontDistribute super."pretty-types"; "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; "prim-spoon" = dontDistribute super."prim-spoon"; "prim-uniq" = dontDistribute super."prim-uniq"; @@ -6097,6 +6199,7 @@ self: super: { "probability" = dontDistribute super."probability"; "probable" = dontDistribute super."probable"; "proc" = dontDistribute super."proc"; + "proc-net" = dontDistribute super."proc-net"; "process-conduit" = dontDistribute super."process-conduit"; "process-extras" = doDistribute super."process-extras_0_3_3_8"; "process-iterio" = dontDistribute super."process-iterio"; @@ -6144,6 +6247,7 @@ self: super: { "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0"; "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; + "protolude" = doDistribute super."protolude_0_1_6"; "proton-haskell" = dontDistribute super."proton-haskell"; "prototype" = dontDistribute super."prototype"; "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; @@ -6219,6 +6323,7 @@ self: super: { "quick-generator" = dontDistribute super."quick-generator"; "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; + "quickcheck-arbitrary-adt" = dontDistribute super."quickcheck-arbitrary-adt"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; @@ -6321,6 +6426,7 @@ self: super: { "reactivity" = dontDistribute super."reactivity"; "reactor" = dontDistribute super."reactor"; "read-bounded" = dontDistribute super."read-bounded"; + "read-env-var" = doDistribute super."read-env-var_0_1_0_0"; "readline-statevar" = dontDistribute super."readline-statevar"; "readpyc" = dontDistribute super."readpyc"; "readshp" = dontDistribute super."readshp"; @@ -6406,6 +6512,7 @@ self: super: { "relacion" = dontDistribute super."relacion"; "relation" = dontDistribute super."relation"; "relational-postgresql8" = dontDistribute super."relational-postgresql8"; + "relational-query" = doDistribute super."relational-query_0_8_3_0"; "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; @@ -6454,6 +6561,7 @@ self: super: { "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; "resource-pool-monad" = dontDistribute super."resource-pool-monad"; "resource-simple" = dontDistribute super."resource-simple"; + "resourcet" = doDistribute super."resourcet_1_1_7_4"; "respond" = dontDistribute super."respond"; "rest-example" = dontDistribute super."rest-example"; "restful-snap" = dontDistribute super."restful-snap"; @@ -6495,6 +6603,7 @@ self: super: { "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; "rlglue" = dontDistribute super."rlglue"; "rlist" = dontDistribute super."rlist"; + "rlwe-challenges" = dontDistribute super."rlwe-challenges"; "rmonad" = dontDistribute super."rmonad"; "rncryptor" = dontDistribute super."rncryptor"; "robin" = dontDistribute super."robin"; @@ -6546,6 +6655,7 @@ self: super: { "ruby-marshal" = dontDistribute super."ruby-marshal"; "ruby-qq" = dontDistribute super."ruby-qq"; "ruff" = dontDistribute super."ruff"; + "ruin" = dontDistribute super."ruin"; "ruler" = dontDistribute super."ruler"; "ruler-core" = dontDistribute super."ruler-core"; "rungekutta" = dontDistribute super."rungekutta"; @@ -6564,6 +6674,7 @@ self: super: { "safe-plugins" = dontDistribute super."safe-plugins"; "safe-printf" = dontDistribute super."safe-printf"; "safeint" = dontDistribute super."safeint"; + "safepath" = dontDistribute super."safepath"; "safer-file-handles" = dontDistribute super."safer-file-handles"; "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; @@ -6724,6 +6835,7 @@ self: super: { "servant-response" = dontDistribute super."servant-response"; "servant-router" = dontDistribute super."servant-router"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-smsc-ru" = dontDistribute super."servant-smsc-ru"; "servant-subscriber" = dontDistribute super."servant-subscriber"; "servant-swagger" = doDistribute super."servant-swagger_1_0_3"; "servant-swagger-ui" = dontDistribute super."servant-swagger-ui"; @@ -6835,6 +6947,7 @@ self: super: { "simple-tabular" = dontDistribute super."simple-tabular"; "simple-tar" = dontDistribute super."simple-tar"; "simple-vec3" = dontDistribute super."simple-vec3"; + "simple-zipper" = dontDistribute super."simple-zipper"; "simpleargs" = dontDistribute super."simpleargs"; "simpleirc-lens" = dontDistribute super."simpleirc-lens"; "simplenote" = dontDistribute super."simplenote"; @@ -6869,12 +6982,14 @@ self: super: { "slack" = dontDistribute super."slack"; "slack-api" = dontDistribute super."slack-api"; "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; + "slave-thread" = doDistribute super."slave-thread_1_0_1_1"; "sleep" = dontDistribute super."sleep"; "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; "slidemews" = dontDistribute super."slidemews"; "sloane" = dontDistribute super."sloane"; "slot-lambda" = dontDistribute super."slot-lambda"; "sloth" = dontDistribute super."sloth"; + "slug" = doDistribute super."slug_0_1_4"; "smallarray" = dontDistribute super."smallarray"; "smallcheck-laws" = dontDistribute super."smallcheck-laws"; "smallcheck-lens" = dontDistribute super."smallcheck-lens"; @@ -6888,6 +7003,7 @@ self: super: { "smartword" = dontDistribute super."smartword"; "sme" = dontDistribute super."sme"; "smerdyakov" = dontDistribute super."smerdyakov"; + "smoothie" = doDistribute super."smoothie_0_4_2_2"; "smsaero" = dontDistribute super."smsaero"; "smt-lib" = dontDistribute super."smt-lib"; "smtlib2" = dontDistribute super."smtlib2"; @@ -6896,12 +7012,14 @@ self: super: { "smtps-gmail" = dontDistribute super."smtps-gmail"; "snake" = dontDistribute super."snake"; "snake-game" = dontDistribute super."snake-game"; + "snap" = doDistribute super."snap_0_14_0_7"; "snap-accept" = dontDistribute super."snap-accept"; "snap-app" = dontDistribute super."snap-app"; "snap-auth-cli" = dontDistribute super."snap-auth-cli"; "snap-blaze" = dontDistribute super."snap-blaze"; "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; + "snap-core" = doDistribute super."snap-core_0_9_8_0"; "snap-cors" = dontDistribute super."snap-cors"; "snap-elm" = dontDistribute super."snap-elm"; "snap-error-collector" = dontDistribute super."snap-error-collector"; @@ -6911,6 +7029,8 @@ self: super: { "snap-loader-static" = dontDistribute super."snap-loader-static"; "snap-predicates" = dontDistribute super."snap-predicates"; "snap-routes" = dontDistribute super."snap-routes"; + "snap-server" = doDistribute super."snap-server_0_9_5_1"; + "snap-templates" = dontDistribute super."snap-templates"; "snap-testing" = dontDistribute super."snap-testing"; "snap-utils" = dontDistribute super."snap-utils"; "snap-web-routes" = dontDistribute super."snap-web-routes"; @@ -6944,6 +7064,7 @@ self: super: { "snaplet-rest" = dontDistribute super."snaplet-rest"; "snaplet-riak" = dontDistribute super."snaplet-riak"; "snaplet-sass" = dontDistribute super."snaplet-sass"; + "snaplet-scoped-session" = dontDistribute super."snaplet-scoped-session"; "snaplet-sedna" = dontDistribute super."snaplet-sedna"; "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; @@ -6966,6 +7087,7 @@ self: super: { "soap" = doDistribute super."soap_0_2_3_0"; "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; + "socket" = doDistribute super."socket_0_6_0_1"; "socket-activation" = dontDistribute super."socket-activation"; "socket-sctp" = dontDistribute super."socket-sctp"; "socketio" = dontDistribute super."socketio"; @@ -7101,6 +7223,7 @@ self: super: { "stm-channelize" = dontDistribute super."stm-channelize"; "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; "stm-conduit" = doDistribute super."stm-conduit_2_8_0"; + "stm-containers" = doDistribute super."stm-containers_0_2_14"; "stm-firehose" = dontDistribute super."stm-firehose"; "stm-io-hooks" = dontDistribute super."stm-io-hooks"; "stm-lifted" = dontDistribute super."stm-lifted"; @@ -7274,6 +7397,7 @@ self: super: { "tag-bits" = dontDistribute super."tag-bits"; "tag-stream" = dontDistribute super."tag-stream"; "tagchup" = dontDistribute super."tagchup"; + "tagged" = doDistribute super."tagged_0_8_4"; "tagged-exception-core" = dontDistribute super."tagged-exception-core"; "tagged-list" = dontDistribute super."tagged-list"; "tagged-th" = dontDistribute super."tagged-th"; @@ -7321,11 +7445,13 @@ self: super: { "teams" = dontDistribute super."teams"; "teeth" = dontDistribute super."teeth"; "telegram" = dontDistribute super."telegram"; + "telegram-api" = doDistribute super."telegram-api_0_4_3_1"; "teleport" = dontDistribute super."teleport"; "template-default" = dontDistribute super."template-default"; "template-haskell-util" = dontDistribute super."template-haskell-util"; "template-hsml" = dontDistribute super."template-hsml"; "template-yj" = dontDistribute super."template-yj"; + "templateify" = dontDistribute super."templateify"; "templatepg" = dontDistribute super."templatepg"; "templater" = dontDistribute super."templater"; "tempo" = dontDistribute super."tempo"; @@ -7588,6 +7714,7 @@ self: super: { "tst" = dontDistribute super."tst"; "tsvsql" = dontDistribute super."tsvsql"; "ttask" = dontDistribute super."ttask"; + "tttool" = doDistribute super."tttool_1_6_1_1"; "tubes" = dontDistribute super."tubes"; "tuntap" = dontDistribute super."tuntap"; "tup-functor" = dontDistribute super."tup-functor"; @@ -7625,6 +7752,7 @@ self: super: { "twitch" = dontDistribute super."twitch"; "twitter" = dontDistribute super."twitter"; "twitter-enumerator" = dontDistribute super."twitter-enumerator"; + "twitter-feed" = doDistribute super."twitter-feed_0_2_0_7"; "tx" = dontDistribute super."tx"; "txt-sushi" = dontDistribute super."txt-sushi"; "txt2rtf" = dontDistribute super."txt2rtf"; @@ -7676,6 +7804,7 @@ self: super: { "typesafe-endian" = dontDistribute super."typesafe-endian"; "typescript-docs" = dontDistribute super."typescript-docs"; "typical" = dontDistribute super."typical"; + "tz" = doDistribute super."tz_0_1_1_1"; "uAgda" = dontDistribute super."uAgda"; "uacpid" = dontDistribute super."uacpid"; "uber" = dontDistribute super."uber"; @@ -7767,6 +7896,7 @@ self: super: { "ureader" = dontDistribute super."ureader"; "urembed" = dontDistribute super."urembed"; "uri" = dontDistribute super."uri"; + "uri-bytestring" = doDistribute super."uri-bytestring_0_2_1_2"; "uri-conduit" = dontDistribute super."uri-conduit"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; @@ -7919,6 +8049,7 @@ self: super: { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; + "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4_1"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7987,6 +8118,7 @@ self: super: { "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; "websockets" = doDistribute super."websockets_0_9_6_2"; + "websockets-snap" = doDistribute super."websockets-snap_0_9_2_0"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; "wedged" = dontDistribute super."wedged"; @@ -7994,6 +8126,7 @@ self: super: { "weighted-search" = dontDistribute super."weighted-search"; "welshy" = dontDistribute super."welshy"; "werewolf" = doDistribute super."werewolf_1_0_2_2"; + "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_4"; "wheb-mongo" = dontDistribute super."wheb-mongo"; "wheb-redis" = dontDistribute super."wheb-redis"; "wheb-strapped" = dontDistribute super."wheb-strapped"; @@ -8060,12 +8193,14 @@ self: super: { "x11-xim" = dontDistribute super."x11-xim"; "x11-xinput" = dontDistribute super."x11-xinput"; "x509-util" = dontDistribute super."x509-util"; + "x86-64bit" = dontDistribute super."x86-64bit"; "xattr" = dontDistribute super."xattr"; "xbattbar" = dontDistribute super."xbattbar"; "xcb-types" = dontDistribute super."xcb-types"; "xcffib" = dontDistribute super."xcffib"; "xchat-plugin" = dontDistribute super."xchat-plugin"; "xcp" = dontDistribute super."xcp"; + "xdcc" = doDistribute super."xdcc_1_0_4"; "xdg-userdirs" = dontDistribute super."xdg-userdirs"; "xdot" = dontDistribute super."xdot"; "xfconf" = dontDistribute super."xfconf"; @@ -8081,6 +8216,7 @@ self: super: { "xinput-conduit" = dontDistribute super."xinput-conduit"; "xkbcommon" = dontDistribute super."xkbcommon"; "xkcd" = dontDistribute super."xkcd"; + "xlsx" = doDistribute super."xlsx_0_2_3"; "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; @@ -8102,6 +8238,7 @@ self: super: { "xml2html" = dontDistribute super."xml2html"; "xml2json" = dontDistribute super."xml2json"; "xml2x" = dontDistribute super."xml2x"; + "xmlhtml" = doDistribute super."xmlhtml_0_2_3_4"; "xmltv" = dontDistribute super."xmltv"; "xmms2-client" = dontDistribute super."xmms2-client"; "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; @@ -8169,7 +8306,9 @@ self: super: { "yeshql" = dontDistribute super."yeshql"; "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; + "yesod-auth" = doDistribute super."yesod-auth_1_4_13_3"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; + "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_5_1_1"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; @@ -8183,6 +8322,7 @@ self: super: { "yesod-comments" = dontDistribute super."yesod-comments"; "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; "yesod-continuations" = dontDistribute super."yesod-continuations"; + "yesod-core" = doDistribute super."yesod-core_1_4_22"; "yesod-crud" = dontDistribute super."yesod-crud"; "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; "yesod-csp" = dontDistribute super."yesod-csp"; @@ -8201,6 +8341,7 @@ self: super: { "yesod-paginate" = dontDistribute super."yesod-paginate"; "yesod-pagination" = dontDistribute super."yesod-pagination"; "yesod-paginator" = dontDistribute super."yesod-paginator"; + "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_5"; "yesod-platform" = dontDistribute super."yesod-platform"; "yesod-pnotify" = dontDistribute super."yesod-pnotify"; "yesod-pure" = dontDistribute super."yesod-pure"; @@ -8218,6 +8359,7 @@ self: super: { "yesod-sass" = dontDistribute super."yesod-sass"; "yesod-session-redis" = dontDistribute super."yesod-session-redis"; "yesod-tableview" = dontDistribute super."yesod-tableview"; + "yesod-test" = doDistribute super."yesod-test_1_5_1_1"; "yesod-test-json" = dontDistribute super."yesod-test-json"; "yesod-tls" = dontDistribute super."yesod-tls"; "yesod-transloadit" = dontDistribute super."yesod-transloadit"; @@ -8252,6 +8394,7 @@ self: super: { "yxdb-utils" = dontDistribute super."yxdb-utils"; "z3" = dontDistribute super."z3"; "z3-encoding" = dontDistribute super."z3-encoding"; + "zabt" = dontDistribute super."zabt"; "zalgo" = dontDistribute super."zalgo"; "zampolit" = dontDistribute super."zampolit"; "zasni-gerna" = dontDistribute super."zasni-gerna"; @@ -8284,5 +8427,6 @@ self: super: { "zoom-refs" = dontDistribute super."zoom-refs"; "zsh-battery" = dontDistribute super."zsh-battery"; "ztail" = dontDistribute super."ztail"; + "zxcvbn-c" = dontDistribute super."zxcvbn-c"; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a3c87a5ef9a..6c3eb98d853 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5623,15 +5623,12 @@ self: { ({ mkDerivation, base, base-compat, GLUT, OpenGL, random }: mkDerivation { pname = "FunGEn"; - version = "1.0"; - sha256 = "119cb0c6bff7a5cf416f0c94a535a0695e4e461105841fed516d207f8c648686"; - revision = "4"; - editedCabalFile = "7994da4a472d9460df18724f7e96cece4ccd4a62516d76f26d14701ceed19623"; + version = "1.0.1"; + sha256 = "79c0d7b46d8d7002a9f7284f9fb4596cedebf906228af0272c0a227dc33654ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat GLUT OpenGL random ]; executableHaskellDepends = [ base GLUT OpenGL random ]; - jailbreak = true; homepage = "http://joyful.com/fungen"; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; @@ -6005,14 +6002,13 @@ self: { }: mkDerivation { pname = "Gamgine"; - version = "0.5"; - sha256 = "80833c191728fed5faec3b761e3dfd85446cd718f708abcc7c2a983e5c7c378c"; + version = "0.5.1"; + sha256 = "ed466cb5abcbe273296c0f7d25f7399ea025b390e63038d4179e94515a6c591f"; libraryHaskellDepends = [ array base bytestring composition cpphs data-lens directory filepath GLFW-b ListZipper mtl OpenGLRaw parsec pretty-show StateVar time unordered-containers utility-ht Vec zlib ]; - jailbreak = true; description = "Some kind of game library or set of utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -6296,7 +6292,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Glob" = callPackage + "Glob_0_7_10" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers, transformers-compat @@ -6317,6 +6313,30 @@ self: { homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Glob" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.7.11"; + sha256 = "0a23f90be0e6a7129efef83716ce1ccd8f48f3c17063aff663232f8eaa18c377"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; }) {}; "GlomeTrace" = callPackage @@ -7134,8 +7154,8 @@ self: { }: mkDerivation { pname = "HGamer3D"; - version = "0.7.1"; - sha256 = "debd2a5f6d7cf4f8e2ffb416fcf3776d7cef3cebe7481dbc01737f22af478a34"; + version = "0.8.0"; + sha256 = "0c4f3277172120510faa8ca00b1400f5b0e74aab59fa84b7968f51f2868be99c"; libraryHaskellDepends = [ base bytestring cereal clock containers directory filepath fresco-binding messagepack text vect @@ -11380,8 +11400,8 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.4.7"; - sha256 = "f239c8601326293226900fc8bb15cc6bfc19f9a10e03756b1785e00a0879c680"; + version = "0.9.6.5"; + sha256 = "5289340f0ec721e35f66e13a871f8fe65d55ed8af9c63ebec2a2cc99db699fb8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -11506,6 +11526,32 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "Mecha" = callPackage + ({ mkDerivation, base, machines }: + mkDerivation { + pname = "Mecha"; + version = "0.0.0.0"; + sha256 = "5c2c92bdb2e808a01430a0b3a4c0e666e6cc644c1f1dd9527c07858a61de0de3"; + libraryHaskellDepends = [ base machines ]; + jailbreak = true; + homepage = "http://github.com/cartazio/mecha"; + description = "mecha are the most complex composite machines known to humanity, lets build them well!"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "Mechs" = callPackage + ({ mkDerivation, base, machines }: + mkDerivation { + pname = "Mechs"; + version = "0.0.0.0"; + sha256 = "612a9965148844bdc7c0981d1b3cc1a40a805a9d062362b19cc85adf7cee7503"; + libraryHaskellDepends = [ base machines ]; + jailbreak = true; + homepage = "http://github.com/cartazio/mecha"; + description = "mecha are the most complex composite machines known to humanity, lets build them well!"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "MemoTrie" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -13019,7 +13065,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "OpenGLRaw" = callPackage + "OpenGLRaw_3_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers }: @@ -13034,6 +13080,24 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mesa;}; + + "OpenGLRaw" = callPackage + ({ mkDerivation, base, bytestring, containers, fixed, half, mesa + , text, transformers + }: + mkDerivation { + pname = "OpenGLRaw"; + version = "3.2.2.0"; + sha256 = "65df144730044166fd8ea2f81470d71e6c5026a7c31df6be45aac9e6ddf93771"; + libraryHaskellDepends = [ + base bytestring containers fixed half text transformers + ]; + librarySystemDepends = [ mesa ]; + homepage = "http://www.haskell.org/haskellwiki/Opengl"; + description = "A raw binding for the OpenGL graphics system"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mesa;}; "OpenGLRaw21" = callPackage @@ -13270,11 +13334,11 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "PPrinter"; - version = "0.0.2"; - sha256 = "f501e812332d106bc08f38cd18609db48caea5e9a88544cf00bb6044beae2ac3"; + version = "0.0.4"; + sha256 = "b3841e572ab3dd8648938b6dbc566c9a7df6aa40f3a3e6d6ea28f267e9a94c04"; libraryHaskellDepends = [ base containers ]; jailbreak = true; - description = "A derivable Haskell pretty printer"; + description = "A generic derivable Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -13680,8 +13744,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.10.1.0"; - sha256 = "af1880de4e2bdb5c0bcdd5e532163d15c6fd33b1f01a1d09c8f5ded3dcfa70c5"; + version = "0.11.0.0"; + sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9"; libraryHaskellDepends = [ base bytestring cairo cereal Chart Chart-cairo containers data-default-class generic-accessors glib gtk3 lens text time @@ -15264,6 +15328,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "SVGFonts_1_6_0_0" = callPackage + ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg + , bytestring, cereal, cereal-vector, containers, data-default-class + , diagrams-core, diagrams-lib, directory, parsec, split, text + , tuple, vector, xml + }: + mkDerivation { + pname = "SVGFonts"; + version = "1.6.0.0"; + sha256 = "f83631b05b6acf45b6226c062a6762de9e6d07421baa881b914988e7c1ee1b7c"; + libraryHaskellDepends = [ + attoparsec base blaze-markup blaze-svg bytestring cereal + cereal-vector containers data-default-class diagrams-core + diagrams-lib directory parsec split text tuple vector xml + ]; + description = "Fonts from the SVG-Font format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "SVGPath" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -16883,6 +16967,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "TransformeR" = callPackage + ({ mkDerivation, base, haskell-src-exts, mtl, parsec, QuickCheck }: + mkDerivation { + pname = "TransformeR"; + version = "0.1.0.0"; + sha256 = "5fb5ff75d4d54c56a26c12abdebb421d9b78ed1419c2cde8bc8e59344dfd3af0"; + revision = "1"; + editedCabalFile = "5b1cee36dc005c693c765b6ca9422ec3aae7b98ea0d4ab68e27b198c2b4214be"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base haskell-src-exts mtl parsec ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/remysucre/TransformeR#readme"; + description = "eDSL in R for Safe Variable Transformarion"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "TransformersStepByStep" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -17274,23 +17377,25 @@ self: { }) {}; "VKHS" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive, clock - , containers, data-default-class, directory, EitherT, filepath - , http-client, http-client-tls, http-types, mtl, network-uri - , optparse-applicative, parsec, pipes, pipes-http, regexpr, split - , tagsoup, text, time, utf8-string, vector + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, clock, containers, data-default-class + , directory, filepath, http-client, http-client-tls, http-types + , mtl, network-uri, optparse-applicative, parsec, pipes, pipes-http + , pretty-show, regexpr, split, taglib, tagsoup, text, time + , utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "1.6.4"; - sha256 = "fb20e23dfa180c5ac4cbc91396fa97563da7cb28c93d283988bf9018d83233fd"; + version = "1.7.1"; + sha256 = "1b6075e1cae298b47d0d71e8a2f42c5bdc1e7428f82e81d9d55f993a3b0247a2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring case-insensitive clock containers - data-default-class directory EitherT filepath http-client + aeson aeson-pretty base bytestring case-insensitive clock + containers data-default-class directory filepath http-client http-client-tls http-types mtl network-uri optparse-applicative - parsec pipes pipes-http split tagsoup time utf8-string vector + parsec pipes pipes-http pretty-show split taglib tagsoup time + utf8-string vector ]; executableHaskellDepends = [ regexpr text ]; homepage = "http://github.com/grwlf/vkhs"; @@ -18135,6 +18240,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) xinput;}; + "XMLParser" = callPackage + ({ mkDerivation, base, parsec }: + mkDerivation { + pname = "XMLParser"; + version = "0.1.0.0"; + sha256 = "906668c9ebaa2ff4cf8eb97b097e80fa26acea05a8762afa7a06d499d30fdbeb"; + libraryHaskellDepends = [ base parsec ]; + homepage = "xy30.com"; + description = "A library to parse xml"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "XMMS" = callPackage ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }: mkDerivation { @@ -19350,14 +19467,13 @@ self: { }: mkDerivation { pname = "acme-http"; - version = "0.2.2"; - sha256 = "f1915876a243d5ad8ff61a7235068a5d0cb0974760d05ecdcd72a0036944bbda"; + version = "0.2.3"; + sha256 = "c2d0991eccec3ded951ca60de542cb1474fa921e6480a35154ad8bac76a0bd87"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring extensible-exceptions mtl network pretty ]; - jailbreak = true; homepage = "http://www.happstack.com"; description = "fastest Haskell PONG server in the world"; license = stdenv.lib.licenses.bsd3; @@ -19391,6 +19507,17 @@ self: { license = "unknown"; }) {}; + "acme-iot" = callPackage + ({ mkDerivation, base, ghc-prim, mtl, transformers }: + mkDerivation { + pname = "acme-iot"; + version = "0.1.0.1"; + sha256 = "fd0d6193f7dc9d17f6a8e1c5a37c85574636cad13e1d84f3f66b4e9f58be8378"; + libraryHaskellDepends = [ base ghc-prim mtl transformers ]; + description = "IO monad transformer"; + license = stdenv.lib.licenses.mit; + }) {}; + "acme-left-pad" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -19502,8 +19629,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "acme-omitted"; - version = "2.0.0.0"; - sha256 = "4d75086cd1957562a65e4284a4dc33dfc1e93a68c634a4bd05b580482a95465e"; + version = "3.0.0.0"; + sha256 = "4966ce601eb6493739244af36f55e22a080bcc1ea9ab9476a801bd3ca30002ac"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/joachifm/acme-omitted#readme"; @@ -20054,7 +20181,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson" = callPackage + "aeson_0_11_2_0" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, bytestring , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl , QuickCheck, quickcheck-instances, scientific, syb, tagged @@ -20066,8 +20193,37 @@ self: { pname = "aeson"; version = "0.11.2.0"; sha256 = "447a454b51b8d6ca9e3b59bc5918115a880a9320afeb9030000fe6c87fd2285e"; - revision = "1"; - editedCabalFile = "680affa9ec12880014875ce8281efb2407efde69c30e9a82654e973e5dc2c8a1"; + revision = "3"; + editedCabalFile = "eba3349e8834893267f4cd28c153613c8c6ea0acb9775db221ad9532d6f96ce1"; + libraryHaskellDepends = [ + attoparsec base bytestring containers deepseq dlist fail ghc-prim + hashable mtl scientific syb tagged template-haskell text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base base-orphans bytestring containers ghc-prim + hashable HUnit QuickCheck quickcheck-instances tagged + template-haskell test-framework test-framework-hunit + test-framework-quickcheck2 text time unordered-containers vector + ]; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "aeson" = callPackage + ({ mkDerivation, attoparsec, base, base-orphans, bytestring + , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl + , QuickCheck, quickcheck-instances, scientific, syb, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson"; + version = "0.11.2.1"; + sha256 = "cc3bc708b5ea5598ae4e37fd8a96d117576031be4b4e2943953e9e19af01b74c"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist fail ghc-prim hashable mtl scientific syb tagged template-haskell text time @@ -20084,6 +20240,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson_1_0_0_0" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, base-orphans + , bytestring, containers, deepseq, dlist, generic-deriving + , ghc-prim, hashable, hashable-time, HUnit, QuickCheck + , quickcheck-instances, scientific, tagged, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, unordered-containers, vector + }: + mkDerivation { + pname = "aeson"; + version = "1.0.0.0"; + sha256 = "a336e25fcd547a277e55f5bdbfdbf896038d0e2311e8396cca15fb3973ef6be9"; + libraryHaskellDepends = [ + attoparsec base base-compat bytestring containers deepseq dlist + ghc-prim hashable scientific tagged template-haskell text time + time-locale-compat unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base base-compat base-orphans bytestring containers + dlist generic-deriving ghc-prim hashable hashable-time HUnit + QuickCheck quickcheck-instances scientific tagged template-haskell + test-framework test-framework-hunit test-framework-quickcheck2 text + time time-locale-compat unordered-containers vector + ]; + homepage = "https://github.com/bos/aeson"; + description = "Fast JSON parsing and encoding"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-applicative" = callPackage ({ mkDerivation, aeson, base, text, unordered-containers }: mkDerivation { @@ -20173,6 +20359,8 @@ self: { pname = "aeson-compat"; version = "0.3.5.1"; sha256 = "6ab707c4e4f15d2f55e968a91809ab52c06d0099a58c1255c0f0c382caf3c843"; + revision = "1"; + editedCabalFile = "3cf09a8689292ddb50651736b5e0b197e4d473632965855f265fbe3e91b8be63"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions hashable nats scientific semigroups tagged text time @@ -20283,23 +20471,48 @@ self: { "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens - , QuickCheck, quickcheck-text, servant-docs, swagger2, tasty - , tasty-hunit, tasty-quickcheck, text, unordered-containers + , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + , vector }: mkDerivation { pname = "aeson-injector"; - version = "1.0.3.0"; - sha256 = "218676310c07f9286df1df9bd1c38bbbf599ab4a825c1980acb0f8555d54e2e5"; + version = "1.0.4.0"; + sha256 = "1f3e4e2d32a919b9ac2f297b3d7ab3fe337aa729aa08eb2c18490c8bd962a30f"; libraryHaskellDepends = [ aeson base bifunctors deepseq lens servant-docs swagger2 text unordered-containers ]; testHaskellDepends = [ - aeson base HUnit lens QuickCheck quickcheck-text swagger2 tasty - tasty-hunit tasty-quickcheck text + aeson base HUnit lens QuickCheck quickcheck-text scientific + swagger2 tasty tasty-hunit tasty-quickcheck text vector + ]; + description = "Injecting fields into aeson values"; + license = stdenv.lib.licenses.mit; + }) {}; + + "aeson-injector_1_0_5_1" = callPackage + ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens + , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + , vector + }: + mkDerivation { + pname = "aeson-injector"; + version = "1.0.5.1"; + sha256 = "61cd48cf2f6fa2ace98841918b092727e478099bf1f9b159eed0966ae3c6a8d9"; + libraryHaskellDepends = [ + aeson base bifunctors deepseq lens servant-docs swagger2 text + unordered-containers + ]; + testHaskellDepends = [ + aeson base HUnit lens QuickCheck quickcheck-text scientific + swagger2 tasty tasty-hunit tasty-quickcheck text vector ]; + jailbreak = true; description = "Injecting fields into aeson values"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-iproute" = callPackage @@ -20583,8 +20796,8 @@ self: { pname = "aeson-utils"; version = "0.3.0.2"; sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f"; - revision = "2"; - editedCabalFile = "32116e177571bd140c1d68b2c0502ba2ab58cc327cf83ca15b40521ceab61682"; + revision = "3"; + editedCabalFile = "38b41ff11ca87f3f1d64c141382f6fbb11f28447056f7e11b93516c4c09520f0"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific text ]; @@ -21277,15 +21490,12 @@ self: { }: mkDerivation { pname = "algebra"; - version = "4.2"; - sha256 = "1ada84a9a816ad86f8bb11627df31f9707230fc21efa8ffdb51a1b314a61e4ac"; - revision = "1"; - editedCabalFile = "621c4b71305b0a6a926f055608b5ca76c4c2360a523bcdf88d80fd10d20f4210"; + version = "4.3"; + sha256 = "394c839f094d0b2f41ea95a87e9a0bd1831657020b9d7c9fa87f4e97fca6c1c0"; libraryHaskellDepends = [ adjunctions array base containers distributive mtl nats semigroupoids semigroups tagged transformers void ]; - jailbreak = true; homepage = "http://github.com/ekmett/algebra/"; description = "Constructive abstract algebra"; license = stdenv.lib.licenses.bsd3; @@ -21361,6 +21571,31 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "algo-s" = callPackage + ({ mkDerivation, base, bytestring, errors, foldl, hspec, mwc-random + , optparse-applicative, primitive, QuickCheck, smallcheck + , unordered-containers + }: + mkDerivation { + pname = "algo-s"; + version = "0.1.0.0"; + sha256 = "bcc19378479a54e8c6604f5805d4b7bfb11de264c51e021c1ef099dc39021443"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base foldl mwc-random primitive unordered-containers + ]; + executableHaskellDepends = [ + base bytestring errors mwc-random optparse-applicative + ]; + testHaskellDepends = [ + base errors foldl hspec mwc-random QuickCheck smallcheck + ]; + jailbreak = true; + description = "An implementation of Knuth's algorithm S"; + license = stdenv.lib.licenses.asl20; + }) {}; + "align" = callPackage ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { @@ -24108,16 +24343,15 @@ self: { "apiary-http-client" = callPackage ({ mkDerivation, apiary, base, bytestring, bytestring-builder - , data-default-class, http-client, http-types, text, transformers - , types-compat, wai + , http-client, http-types, text, transformers, types-compat, wai }: mkDerivation { pname = "apiary-http-client"; - version = "0.1.2.0"; - sha256 = "056fdeea4f3cb0c93a4b36e3c1d1695c45804ecdef45e9a77e6f9a9c87895413"; + version = "0.1.3.0"; + sha256 = "ed66cb3783158a7fce4409a61d8c20fa06ee2d083dbae37b086fa49af6663adc"; libraryHaskellDepends = [ - apiary base bytestring bytestring-builder data-default-class - http-client http-types text transformers types-compat wai + apiary base bytestring bytestring-builder http-client http-types + text transformers types-compat wai ]; jailbreak = true; homepage = "https://github.com/winterland1989/apiary-http-client"; @@ -24470,7 +24704,10 @@ self: { pname = "applicative-quoters"; version = "0.1.0.8"; sha256 = "f45d567b408bacb17ef567857affb5cdf69299dd5b57fd559370a291404ba282"; + revision = "1"; + editedCabalFile = "5786bfaf50dbb1e35310eb17f4e090eabfd015c754f551cf637cf63be8b48d31"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; + jailbreak = true; description = "Quasiquoters for idiom brackets and an applicative do-notation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -24698,7 +24935,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {arbb_dev = null;}; - "arbtt" = callPackage + "arbtt_0_9_0_9" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -24725,6 +24962,36 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libXScrnSaver;}; + + "arbtt" = callPackage + ({ mkDerivation, aeson, array, base, binary, bytestring + , bytestring-progress, containers, deepseq, directory, filepath + , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty + , tasty-golden, tasty-hunit, terminal-progress-bar, time + , transformers, unix, utf8-string, X11 + }: + mkDerivation { + pname = "arbtt"; + version = "0.9.0.10"; + sha256 = "cc58ebe8508c682f783b238652f0415958c948b4957854624c4f23c131b0fcc2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base binary bytestring bytestring-progress containers + deepseq directory filepath parsec pcre-light strict + terminal-progress-bar time transformers unix utf8-string X11 + ]; + executableSystemDepends = [ libXScrnSaver ]; + testHaskellDepends = [ + base binary bytestring containers deepseq directory parsec + pcre-light process-extras tasty tasty-golden tasty-hunit time + transformers unix utf8-string + ]; + homepage = "http://arbtt.nomeata.de/"; + description = "Automatic Rule-Based Time Tracker"; + license = "GPL"; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -25463,7 +25730,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "asciidiagram" = callPackage + "asciidiagram_1_3_1_1" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers , directory, filepath, FontyFruity, JuicyPixels, lens, linear, mtl , optparse-applicative, rasterific-svg, svg-tree, text, vector @@ -25489,6 +25756,31 @@ self: { doCheck = false; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "asciidiagram" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative + , rasterific-svg, svg-tree, text, vector + }: + mkDerivation { + pname = "asciidiagram"; + version = "1.3.1.2"; + sha256 = "dafcfba0d75da40e33bc3270b25c8cdd48f1cf07cc64d21f8eac4024d7ddddba"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers FontyFruity JuicyPixels lens linear mtl + rasterific-svg svg-tree text vector + ]; + executableHaskellDepends = [ + base bytestring directory filepath FontyFruity JuicyPixels + optparse-applicative rasterific-svg svg-tree text + ]; + doCheck = false; + description = "Pretty rendering of Ascii diagram into svg or png"; + license = stdenv.lib.licenses.bsd3; }) {}; "asic" = callPackage @@ -26806,12 +27098,12 @@ self: { ({ mkDerivation, base, directory, mtl, process, unix }: mkDerivation { pname = "autoproc"; - version = "0.1.2"; - sha256 = "c574e182b1eae253e7d63b8d6c3b648d57b5508e465e36146536a12c0556347b"; + version = "0.2.1"; + sha256 = "cf4c46c463fe3812d2c1bf915b5d7dfa5549f33a942b1c08615523772461e98f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mtl process unix ]; - homepage = "http://code.haskell.org/autoproc"; + homepage = "https://github.com/dagit/autoproc"; description = "EDSL for Procmail scripts"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -29627,6 +29919,8 @@ self: { pname = "binary-orphans"; version = "0.1.5.1"; sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c"; + revision = "2"; + editedCabalFile = "987c5b6812e28ae7ab9b6073cbb6e5db7d4e1f6c286dc5b69d8a1d6bcb51831b"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -29792,6 +30086,8 @@ self: { pname = "binary-tagged"; version = "0.1.4.0"; sha256 = "dc25744ebd21f8a050341cd7c25c69f66734b2930aaad89b411cf68c28605671"; + revision = "1"; + editedCabalFile = "0448d0fe13530497a639b2bd8fc290522fa526aee5e3486bc15003797cd84bc7"; libraryHaskellDepends = [ aeson array base binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text time @@ -31109,8 +31405,8 @@ self: { }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "0.2.0.0"; - sha256 = "0bfb82323eaf0064990c17cd2e544416c8e8dfe71749b01a86fca51eaa1d6dc1"; + version = "0.2.2.0"; + sha256 = "cc0d19904ea5363453765c702b5f1e6f1ac99a2a90d8d17223d94d610dee3806"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31700,8 +31996,8 @@ self: { pname = "blank-canvas"; version = "0.6"; sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3"; - revision = "6"; - editedCabalFile = "055ded567ebb0559690086233e053175df86dc614cd3fa172c5efdaf4aaf0489"; + revision = "7"; + editedCabalFile = "b965b55168cd3f25ee55944fb39f9509c847bb48f69e8ec443614fc8ff4960dd"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring colour containers data-default-class http-types kansas-comet mime-types @@ -32493,10 +32789,9 @@ self: { ({ mkDerivation, base, binary, bytestring }: mkDerivation { pname = "bmp"; - version = "1.2.6.1"; - sha256 = "077d81403b98c554dd3b55334c3b989ff7fae84f344e7c7e2c2385f5e4cbac55"; + version = "1.2.6.3"; + sha256 = "3cc63de40fe088ce4d1c869180fd2309bcec35a940c9e3d1904d3520ca2fdacc"; libraryHaskellDepends = [ base binary bytestring ]; - jailbreak = true; homepage = "https://github.com/benl23x5/bmp"; description = "Read and write uncompressed BMP image files"; license = stdenv.lib.licenses.mit; @@ -34356,6 +34651,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal" = callPackage + ({ mkDerivation, base, youProbablyWantCapitalCabal }: + mkDerivation { + pname = "cabal"; + version = "0.0.0.0"; + sha256 = "7a06b65d9d4ddb38f54e865e38742d7b600e0f646f0e07ce9015659ff7563bf6"; + revision = "2"; + editedCabalFile = "3aaac7f6716c93dec3f62f807a2ab25217f419fa30f566a3d9c4ad939e075bb6"; + libraryHaskellDepends = [ base youProbablyWantCapitalCabal ]; + doHaddock = false; + jailbreak = true; + description = "placeholder for Cabal package, you want the upper case Cabal"; + license = stdenv.lib.licenses.bsd2; + broken = true; + }) {youProbablyWantCapitalCabal = null;}; + "cabal-audit" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, HTTP , optparse-applicative @@ -34382,8 +34693,8 @@ self: { }: mkDerivation { pname = "cabal-bounds"; - version = "1.0.2"; - sha256 = "f5bc846128bea555c9f30e1a61007a5d8e45f30e162c19e98c23bfff6049d3b6"; + version = "1.0.4"; + sha256 = "2621cd4e76357bcf7f175413c111874c6afc552d80c85372dc43f4bcd5c99719"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34394,7 +34705,6 @@ self: { testHaskellDepends = [ base directory filepath Glob process tasty tasty-golden ]; - jailbreak = true; description = "A command line program for managing the bounds/versions of the dependencies in a cabal file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -34406,8 +34716,8 @@ self: { }: mkDerivation { pname = "cabal-cargs"; - version = "0.7.9"; - sha256 = "58de52a44a9e9895c2bca3d9689012ad3f525a8a5c3b0ebda7b1c5b461d6002d"; + version = "0.7.10"; + sha256 = "464b299f095150bd0831df7dbab45d272909875a21f4030b79aee58faefdbb1d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34417,7 +34727,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base filepath tasty tasty-golden ]; - jailbreak = true; description = "A command line program for extracting compiler arguments from a cabal file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -34839,13 +35148,12 @@ self: { }: mkDerivation { pname = "cabal-lenses"; - version = "0.4.7"; - sha256 = "391c03e92137fde75bfc2fe7d6f3369c53a1a683e8da6d3cf14d901e7a1b58a2"; + version = "0.4.8"; + sha256 = "0dd6bbe6b77f6d8cfaff690f0ce53064e9fae10d317278205895fa5fb8d13195"; libraryHaskellDepends = [ base Cabal either lens strict system-fileio system-filepath text transformers unordered-containers ]; - jailbreak = true; description = "Lenses and traversals for the Cabal library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -34906,8 +35214,8 @@ self: { }: mkDerivation { pname = "cabal-mon"; - version = "1.0.1"; - sha256 = "602376f6e45c41ea6d72935c0833ce62dcb5eb789edfe56c72dee3368eabcff2"; + version = "1.0.2"; + sha256 = "22e2d4a7faf7ece320ce4938c658e59fe9002ea14d12543343cadba109e57e94"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35505,16 +35813,16 @@ self: { "cacophony" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , cryptonite, deepseq, directory, free, hlint, lens, memory - , monad-coroutine, mtl, text, transformers + , cryptonite, deepseq, directory, exceptions, free, hlint, lens + , memory, monad-coroutine, mtl, safe-exceptions, text, transformers }: mkDerivation { pname = "cacophony"; - version = "0.7.0"; - sha256 = "e67a7fb0e957b47dd6a9b4b956cad17ff42022bca119bb08422d52050a51379f"; + version = "0.8.0"; + sha256 = "063069adea7ae07f3ec458b76194edca2acb96871acc0fd437cc6b0c68739c01"; libraryHaskellDepends = [ - base bytestring cryptonite deepseq free lens memory monad-coroutine - mtl transformers + base bytestring cryptonite deepseq exceptions free lens memory + monad-coroutine mtl safe-exceptions transformers ]; testHaskellDepends = [ aeson async base base16-bytestring bytestring directory free hlint @@ -36017,6 +36325,22 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "canteven-parsedate" = callPackage + ({ mkDerivation, base, Cabal, old-locale, time, timezone-series, tz + }: + mkDerivation { + pname = "canteven-parsedate"; + version = "1.0.1.2"; + sha256 = "8522cd860b42f3b953c122d928a46c5b2c8640d26ec46dec1c975a94b8208ab7"; + libraryHaskellDepends = [ base time timezone-series tz ]; + testHaskellDepends = [ + base Cabal old-locale time timezone-series tz + ]; + jailbreak = true; + description = "Date / time parsing utilities that try to guess the date / time format"; + license = stdenv.lib.licenses.asl20; + }) {}; + "canteven-template" = callPackage ({ mkDerivation, base, blaze-html, bytestring, data-default , markdown, template-haskell, text @@ -36210,7 +36534,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "carray" = callPackage + "carray_0_1_6_4" = callPackage ({ mkDerivation, array, base, binary, bytestring, ix-shapable , QuickCheck, syb }: @@ -36224,6 +36548,23 @@ self: { testHaskellDepends = [ array base ix-shapable QuickCheck ]; description = "A C-compatible array library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "carray" = callPackage + ({ mkDerivation, array, base, binary, bytestring, ix-shapable + , QuickCheck, syb + }: + mkDerivation { + pname = "carray"; + version = "0.1.6.5"; + sha256 = "6b253bd77cbe3cf1ed05ed60fa45f72f2ed5f6a0db5395ba26d58317b146786b"; + libraryHaskellDepends = [ + array base binary bytestring ix-shapable QuickCheck syb + ]; + testHaskellDepends = [ array base ix-shapable QuickCheck ]; + description = "A C-compatible array library"; + license = stdenv.lib.licenses.bsd3; }) {}; "cartel_0_16_0_0" = callPackage @@ -36302,8 +36643,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.0.0.4"; - sha256 = "0bc7e65fb3bedf79511642bedfa03670c062a189ae8ab034d6756707025c91cf"; + version = "3.0.0.5"; + sha256 = "338690af83dd423a118f00fdf7dba3b6a4b49875f7e9e685bc2a68f5284853a9"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -36648,8 +36989,8 @@ self: { }: mkDerivation { pname = "cassava-streams"; - version = "0.2.0.0"; - sha256 = "b4e825309533f9bd33728de92950eea33f362ea5bfd4e04689777b3760f69d6d"; + version = "0.3.0.0"; + sha256 = "81a4548c78474d025c525728a57616a657e5d59c377625c54ebb3f1818f5c49b"; libraryHaskellDepends = [ base bytestring cassava io-streams vector ]; @@ -37665,8 +38006,8 @@ self: { }: mkDerivation { pname = "chatter"; - version = "0.8.0.2"; - sha256 = "d298cc5ce3d95df664e050e17395d56b0b4206b6557af14345eee90768c9ecc0"; + version = "0.9.0.0"; + sha256 = "edf8212aeb172c7ba63be8d72eded4f7ca3eb0c29fbf78b134d7a9e64f989f5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38754,8 +39095,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.6.22"; - sha256 = "26fabe321e4f27974428672d69e39699368674978559242ea28699bd76d35e4d"; + version = "0.6.23"; + sha256 = "ec13dd8c85c452751860d761f44744c9a1d70ad81c053fc8a5747c6359a3378c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -38805,8 +39146,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.6.20"; - sha256 = "93e5c409bf5bcc27a2623876c53a7123ed5bbb5c9b0839a6bca406b5823b8304"; + version = "0.6.21"; + sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad"; libraryHaskellDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath ghc hashable @@ -38834,6 +39175,7 @@ self: { singletons template-haskell ]; testHaskellDepends = [ base doctest ]; + jailbreak = true; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; @@ -38848,8 +39190,8 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "0.10.11"; - sha256 = "6b502cd0ceceee1f61d9150f29453b17246e128d5a6d5b21eeb301095351a627"; + version = "0.10.13"; + sha256 = "e0c9704a5ebf42acffa66a22d9282710d40650301b38538080a3d0c56073f203"; libraryHaskellDepends = [ array base data-default deepseq ghc-prim ghc-typelits-extra ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection @@ -38899,8 +39241,8 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.6.8"; - sha256 = "2d8847467c0c6e0d20125c36c806f6fbd7e39ccf38fbb50572e76f5399010a28"; + version = "0.6.9"; + sha256 = "502f2c31093762ce8d4dc8dcb9a13b69c3a298fdfd1f417581d4f0438ed865ff"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -38934,8 +39276,8 @@ self: { }: mkDerivation { pname = "clash-verilog"; - version = "0.6.8"; - sha256 = "3f7ba6a32c6313c55e856038a13b214f51d9084a273209692323700ee2ee2ce3"; + version = "0.6.9"; + sha256 = "a4daac5e9c67349de419e301ab969922d63bd4680061288a8b24bb10b2f78e3b"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -40355,6 +40697,17 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "codeworld-api" = callPackage + ({ mkDerivation, base, blank-canvas, mtl, random, text, time }: + mkDerivation { + pname = "codeworld-api"; + version = "0.1.0.1"; + sha256 = "0cfc3b9f2feef07ee09ed9a9c5f95ea909202ec16ce5bbc08c3c1462945affce"; + libraryHaskellDepends = [ base blank-canvas mtl random text time ]; + description = "Graphics library for CodeWorld"; + license = stdenv.lib.licenses.asl20; + }) {}; + "codex_0_4_0_10" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash , directory, either, filepath, hackage-db, http-client, lens @@ -42018,7 +42371,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "conduit" = callPackage + "conduit_1_2_6_6" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, mtl, QuickCheck, resourcet, safe, transformers , transformers-base @@ -42038,6 +42391,29 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, mtl, QuickCheck, resourcet, safe, transformers + , transformers-base + }: + mkDerivation { + pname = "conduit"; + version = "1.2.7"; + sha256 = "36b21db556cf81d3080edd50f417ce5dd8391f32cf2f8078b48110cfd6ed3be5"; + libraryHaskellDepends = [ + base exceptions lifted-base mmorph mtl resourcet transformers + transformers-base + ]; + testHaskellDepends = [ + base containers exceptions hspec mtl QuickCheck resourcet safe + transformers + ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-audio" = callPackage @@ -42355,8 +42731,8 @@ self: { }: mkDerivation { pname = "config-manager"; - version = "0.3.0.0"; - sha256 = "22d805602714e700507a68c62b4ccc0bd57aa0bef739d0256f19a8d43230b5fc"; + version = "0.3.0.1"; + sha256 = "8b025eb8870a68d061526d76e55c860cc75ff5c61cb23a27b65d6fa0450732e3"; libraryHaskellDepends = [ base filepath parsec text time unordered-containers ]; @@ -42529,15 +42905,14 @@ self: { }: mkDerivation { pname = "confsolve"; - version = "0.5.4"; - sha256 = "2140e46d9eb4c18fb6abca962ae47952468922ca336ba7ffa63fb706157b0425"; + version = "0.5.5"; + sha256 = "2f631b8794d54e118d40c663db03695a6c7bf8c2d42bf4b4882aae7165969973"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base cmdargs process system-fileio system-filepath text time unordered-containers ]; - jailbreak = true; description = "A command line tool for resolving conflicts of file synchronizers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42602,7 +42977,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "connection" = callPackage + "connection_0_2_5" = callPackage ({ mkDerivation, base, byteable, bytestring, containers , data-default-class, network, socks, tls, x509, x509-store , x509-system, x509-validation @@ -42618,6 +42993,25 @@ self: { homepage = "http://github.com/vincenthz/hs-connection"; description = "Simple and easy network connections API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "connection" = callPackage + ({ mkDerivation, base, byteable, bytestring, containers + , data-default-class, network, socks, tls, x509, x509-store + , x509-system, x509-validation + }: + mkDerivation { + pname = "connection"; + version = "0.2.6"; + sha256 = "03c16c28094a92ccf8fd58c61a4555b60158615914676c5c65c998a69ece37b0"; + libraryHaskellDepends = [ + base byteable bytestring containers data-default-class network + socks tls x509 x509-store x509-system x509-validation + ]; + homepage = "http://github.com/vincenthz/hs-connection"; + description = "Simple and easy network connections API"; + license = stdenv.lib.licenses.bsd3; }) {}; "connection-pool" = callPackage @@ -43062,7 +43456,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "contravariant-extras" = callPackage + "contravariant-extras_0_3_2" = callPackage ({ mkDerivation, base-prelude, contravariant, template-haskell , tuple-th }: @@ -43076,6 +43470,23 @@ self: { homepage = "https://github.com/nikita-volkov/contravariant-extras"; description = "Extras for the \"contravariant\" package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "contravariant-extras" = callPackage + ({ mkDerivation, base-prelude, contravariant, template-haskell + , tuple-th + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.3.1"; + sha256 = "f35d9df4d1c0fa767afca6500c6ab598f052128abc513259930ef5b6bc7c79d5"; + libraryHaskellDepends = [ + base-prelude contravariant template-haskell tuple-th + ]; + homepage = "https://github.com/nikita-volkov/contravariant-extras"; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; }) {}; "control-bool" = callPackage @@ -44642,6 +45053,54 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "credentials" = callPackage + ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb + , amazonka-kms, base, bytestring, conduit, cryptonite, exceptions + , lens, memory, retry, semigroups, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "credentials"; + version = "0.0.1.1"; + sha256 = "e9febd40fa2e4c551423ad9d7e323b2d10b1dc0dd56e551612e210f1e16a1e15"; + libraryHaskellDepends = [ + aeson amazonka amazonka-core amazonka-dynamodb amazonka-kms base + bytestring conduit cryptonite exceptions lens memory retry + semigroups text time transformers unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/brendanhay/credentials"; + description = "Secure Credentials Storage and Distribution"; + license = "unknown"; + }) {}; + + "credentials-cli" = callPackage + ({ mkDerivation, aeson, aeson-pretty, amazonka, amazonka-core + , amazonka-dynamodb, attoparsec, base, bytestring, conduit + , conduit-extra, credentials, cryptonite, exceptions, lens, mmorph + , mtl, optparse-applicative, resourcet, text, transformers-base + , unordered-containers, uri-bytestring + }: + mkDerivation { + pname = "credentials-cli"; + version = "0.0.1.1"; + sha256 = "9abcaf0cbbb5e523d4ceeadff677844c5af668a5374a78ee5a004101fea90d70"; + revision = "1"; + editedCabalFile = "b64b55d3e9904385ed1f18bcf5e60baa7d8e06aeec6f29c8b9b1a9fc62a2f219"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty amazonka amazonka-core amazonka-dynamodb + attoparsec base bytestring conduit conduit-extra credentials + cryptonite exceptions lens mmorph mtl optparse-applicative + resourcet text transformers-base unordered-containers + uri-bytestring + ]; + homepage = "https://github.com/brendanhay/credentials"; + description = "Secure Credentials Administration"; + license = "unknown"; + }) {}; + "crf-chain1" = callPackage ({ mkDerivation, array, base, binary, containers, data-lens , logfloat, monad-codec, parallel, random, sgd, vector @@ -44756,8 +45215,8 @@ self: { pname = "criterion"; version = "1.1.1.0"; sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd"; - revision = "1"; - editedCabalFile = "a56744ffa937e244ac18d8257f4746a1e2b31fbce69e9602033f7f4f2ebcd7c6"; + revision = "3"; + editedCabalFile = "0e89cf15205fea2b90e95198774fba60839aab36fc67a695baa482d55013978e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45471,8 +45930,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.17"; - sha256 = "a6c6a129b844c55580c4bfd79ecdf5bdc37ea8be6634ae7858015219111156c8"; + version = "0.19"; + sha256 = "1ceac099f80058111b0a57a5bd5c8f336ba875060eb69f3d1981d8bbc99885e7"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -46130,6 +46589,23 @@ self: { license = "unknown"; }) {}; + "currency-convert" = callPackage + ({ mkDerivation, aeson, base, http-conduit, text + , unordered-containers + }: + mkDerivation { + pname = "currency-convert"; + version = "0.2.1.0"; + sha256 = "c4b7a948d5755a3e61bb33045e35205349294c8b38cc65c6b54d7d20089c3378"; + libraryHaskellDepends = [ + aeson base http-conduit text unordered-containers + ]; + jailbreak = true; + homepage = "http://tuomas56.github.io/currency-convert"; + description = "Typesafe currency conversion"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "current-locale" = callPackage ({ mkDerivation, base, old-locale, process, split }: mkDerivation { @@ -46309,8 +46785,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.3.4"; - sha256 = "dc0d463fc4a2065a72aa3c14acb3b1e04cff5b0eaddf52dfc076db74dcf01698"; + version = "0.1.4"; + sha256 = "e194ab6f0447adf7954b1b94b1533ded8c79af99a7c8976e316934a22452f5b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46423,20 +46899,20 @@ self: { }) {}; "damnpacket" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq - , QuickCheck, text + ({ mkDerivation, attoparsec, base, bytestring, fail, hspec + , html-entities, HUnit, QuickCheck, template-haskell, text + , th-lift-instances }: mkDerivation { pname = "damnpacket"; - version = "0.6.0"; - sha256 = "cb2f95b9bbac573f71f14a4f4ddb05df2c5d05bd2a0fc45d472e29e1359bec8c"; + version = "1.0.2"; + sha256 = "b00c792670558fc2849f932232361fe4b59c7ce62009e5efbab71a162438ea05"; libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq text + attoparsec base bytestring fail html-entities template-haskell text + th-lift-instances ]; - testHaskellDepends = [ base containers QuickCheck text ]; - jailbreak = true; - homepage = "https://github.com/joelteon/damnpacket"; - description = "Parsing dAmn packets"; + testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ]; + description = "Parsing dAmn messages"; license = stdenv.lib.licenses.mit; }) {}; @@ -48692,7 +49168,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dawg-ord" = callPackage + "dawg-ord_0_5_0_1" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers , vector @@ -48712,6 +49188,28 @@ self: { homepage = "https://github.com/kawu/dawg-ord"; description = "Directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dawg-ord" = callPackage + ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers + , vector + }: + mkDerivation { + pname = "dawg-ord"; + version = "0.5.0.2"; + sha256 = "7a15c20781257d9002d3037828083da2f7adc37b04cd02c68439f9882f246a82"; + libraryHaskellDepends = [ + base containers mtl transformers vector + ]; + testHaskellDepends = [ + base containers HUnit mtl smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/kawu/dawg-ord"; + description = "Directed acyclic word graphs"; + license = stdenv.lib.licenses.bsd3; }) {}; "dbcleaner" = callPackage @@ -48763,6 +49261,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dbm" = callPackage + ({ mkDerivation, base, directory, ini, optparse-applicative + , sqlite-simple, text, time + }: + mkDerivation { + pname = "dbm"; + version = "0.1.1.0"; + sha256 = "d3e9b3896f0c6710c001b97a1b6fc54ecde5a753cbc96df227ea9780fd126fee"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory ini optparse-applicative sqlite-simple text time + ]; + homepage = "https://github.com/relrod/dbm"; + description = "A *simple* database migration tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dbmigrations" = callPackage ({ mkDerivation, base, bytestring, configurator, containers , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3 @@ -50198,6 +50714,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "deque" = callPackage + ({ mkDerivation, base-prelude }: + mkDerivation { + pname = "deque"; + version = "0.1"; + sha256 = "881f1118d18e1868a04443e2826aede8316a266ad93ce1e00a999834fa028e2d"; + libraryHaskellDepends = [ base-prelude ]; + homepage = "https://github.com/nikita-volkov/deque"; + description = "Double-ended queue"; + license = stdenv.lib.licenses.mit; + }) {}; + "dequeue" = callPackage ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck , safe @@ -50440,25 +50968,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "descriptive_0_0_2" = callPackage - ({ mkDerivation, aeson, base, bifunctors, containers, mtl, text - , transformers - }: - mkDerivation { - pname = "descriptive"; - version = "0.0.2"; - sha256 = "1711cae6ac16ecf03eef771ef101cdda4c64f7a16d69a912ae1a57ad15a1004a"; - revision = "3"; - editedCabalFile = "0aeae1dd5ab8c21ade57c1e036600b8162cd790823618a9c5894417ba68e2ea2"; - libraryHaskellDepends = [ - aeson base bifunctors containers mtl text transformers - ]; - homepage = "https://github.com/chrisdone/descriptive"; - description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "descriptive" = callPackage ({ mkDerivation, aeson, base, bifunctors, containers, hspec, HUnit , mtl, scientific, text, transformers, vector @@ -50479,6 +50988,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "desert" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , http-conduit, MissingH, process, transformers + }: + mkDerivation { + pname = "desert"; + version = "0.1.0.1"; + sha256 = "105d7fe94d34dc1efcb5e391a74a0999429af6d7d031f2dc5c2b1c87ba261170"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath http-conduit MissingH process + transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/zjhmale/desert"; + description = "a simple build tool for OCaml projects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "despair" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -50715,7 +51245,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-cairo" = callPackage + "diagrams-cairo_1_3_1" = callPackage ({ mkDerivation, array, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, filepath , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango @@ -50737,7 +51267,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-canvas" = callPackage + "diagrams-cairo" = callPackage + ({ mkDerivation, array, base, bytestring, cairo, colour, containers + , data-default-class, diagrams-core, diagrams-lib, filepath + , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango + , split, statestack, transformers, unix, vector + }: + mkDerivation { + pname = "diagrams-cairo"; + version = "1.3.1.1"; + sha256 = "00c635a58a480033a2fc1240b703a4afab721f990e1412f57b8fa6becd6878b8"; + libraryHaskellDepends = [ + array base bytestring cairo colour containers data-default-class + diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl + optparse-applicative pango split statestack transformers unix + vector + ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Cairo backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "diagrams-canvas_1_3_0_5" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl , NumInstances, optparse-applicative, statestack, text @@ -50757,6 +51309,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-canvas" = callPackage + ({ mkDerivation, base, blank-canvas, cmdargs, containers + , data-default-class, diagrams-core, diagrams-lib, lens, mtl + , NumInstances, optparse-applicative, statestack, text + }: + mkDerivation { + pname = "diagrams-canvas"; + version = "1.3.0.6"; + sha256 = "20e905738a7a78061690fc55209041b2c3cdd6f6b6a534b6fdb75728a595a0ff"; + libraryHaskellDepends = [ + base blank-canvas cmdargs containers data-default-class + diagrams-core diagrams-lib lens mtl NumInstances + optparse-applicative statestack text + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib @@ -50890,7 +51462,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "diagrams-html5" = callPackage + "diagrams-html5_1_3_0_6" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -50910,7 +51482,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-lib" = callPackage + "diagrams-html5" = callPackage + ({ mkDerivation, base, cmdargs, containers, data-default-class + , diagrams-core, diagrams-lib, lens, mtl, NumInstances + , optparse-applicative, split, statestack, static-canvas, text + }: + mkDerivation { + pname = "diagrams-html5"; + version = "1.3.0.7"; + sha256 = "8bddc55b95b6e0616552d09e59ae74ae315d296ef816552c5d7649035d49f7a4"; + libraryHaskellDepends = [ + base cmdargs containers data-default-class diagrams-core + diagrams-lib lens mtl NumInstances optparse-applicative split + statestack static-canvas text + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "HTML5 canvas backend for diagrams drawing EDSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "diagrams-lib_1_3_1_3" = callPackage ({ mkDerivation, active, adjunctions, array, base, colour , containers, data-default-class, diagrams-core, diagrams-solve , directory, distributive, dual-tree, exceptions, filepath @@ -50923,6 +51515,35 @@ self: { pname = "diagrams-lib"; version = "1.3.1.3"; sha256 = "0bf7e87e0d60af17ebf57d9d770cadc447da8db38b9f54114dd30e25a68d79e8"; + revision = "2"; + editedCabalFile = "f2c86b960dc6a1d416cd78be2e086f0e9b09b493463c1f00b60fa6e1494a01ae"; + libraryHaskellDepends = [ + active adjunctions array base colour containers data-default-class + diagrams-core diagrams-solve directory distributive dual-tree + exceptions filepath fingertree fsnotify hashable intervals + JuicyPixels lens linear monoid-extras mtl optparse-applicative + process semigroups tagged text transformers unordered-containers + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Embedded domain-specific language for declarative graphics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "diagrams-lib" = callPackage + ({ mkDerivation, active, adjunctions, array, base, colour + , containers, data-default-class, diagrams-core, diagrams-solve + , directory, distributive, dual-tree, exceptions, filepath + , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens + , linear, monoid-extras, mtl, optparse-applicative, process + , semigroups, tagged, tasty, tasty-hunit, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "diagrams-lib"; + version = "1.3.1.4"; + sha256 = "0ed2c2b81a872abc747dffcce74a7b19714f81a78dc44426d9d2baa999009617"; libraryHaskellDepends = [ active adjunctions array base colour containers data-default-class diagrams-core diagrams-solve directory distributive dual-tree @@ -51040,7 +51661,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-rasterific" = callPackage + "diagrams-rasterific_1_3_1_7" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split @@ -51061,6 +51682,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-rasterific" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable + , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split + , unix + }: + mkDerivation { + pname = "diagrams-rasterific"; + version = "1.3.1.8"; + sha256 = "b76001105055563e2a51f6dbff2e1c12547644014f748e7564f1ded42b75cb99"; + libraryHaskellDepends = [ + base bytestring containers data-default-class diagrams-core + diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl + optparse-applicative Rasterific split unix + ]; + homepage = "http://projects.haskell.org/diagrams/"; + description = "Rasterific backend for diagrams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diagrams-reflex" = callPackage ({ mkDerivation, base, colour, containers, diagrams-core , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom @@ -51142,8 +51784,8 @@ self: { }: mkDerivation { pname = "diagrams-svg"; - version = "1.4.0.2"; - sha256 = "d496eb5078637373988e84b412c24af8b929c51b14c77f1df3fb19e6117e446f"; + version = "1.4.0.3"; + sha256 = "1ed1579ea601d2061373e636f558765179981b3d70e62cf18adf0617c4bf59e5"; libraryHaskellDepends = [ base base64-bytestring bytestring colour containers diagrams-core diagrams-lib directory filepath hashable JuicyPixels lens @@ -51393,6 +52035,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "difftodo" = callPackage + ({ mkDerivation, base, bytestring, diff-parse, highlighting-kate + , optparse-applicative, protolude, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "difftodo"; + version = "0.1.0"; + sha256 = "ab1c892daec3ecee50d16f8353e6da6195d3da86e1bca0ab8f3cb908a9746066"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base diff-parse highlighting-kate protolude text + ]; + executableHaskellDepends = [ + base optparse-applicative protolude text + ]; + testHaskellDepends = [ + base bytestring highlighting-kate protolude tasty tasty-hunit text + ]; + homepage = "https://github.com/jml/difftodo#readme"; + description = "Generate todo lists from source code"; + license = stdenv.lib.licenses.asl20; + }) {}; + "digamma" = callPackage ({ mkDerivation, base, math-functions }: mkDerivation { @@ -51463,7 +52129,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "digestive-functors" = callPackage + "digestive-functors_0_8_0_1" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl , old-locale, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text, time @@ -51484,6 +52150,30 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "digestive-functors" = callPackage + ({ mkDerivation, base, bytestring, containers, HUnit, mtl + , old-locale, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time + }: + mkDerivation { + pname = "digestive-functors"; + version = "0.8.1.0"; + sha256 = "3c2bba9783279cb52d7fdbd03f0cea46b6f2c23f788953016568cd8f0a389c8a"; + libraryHaskellDepends = [ + base bytestring containers mtl old-locale text time + ]; + testHaskellDepends = [ + base bytestring containers HUnit mtl old-locale QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + time + ]; + jailbreak = true; + homepage = "http://github.com/jaspervdj/digestive-functors"; + description = "A practical formlet library"; + license = stdenv.lib.licenses.bsd3; }) {}; "digestive-functors-aeson" = callPackage @@ -51553,6 +52243,7 @@ self: { libraryHaskellDepends = [ base blaze-builder digestive-functors heist mtl text xmlhtml ]; + jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -51610,8 +52301,8 @@ self: { }: mkDerivation { pname = "digestive-functors-snap"; - version = "0.6.1.3"; - sha256 = "f0455512104e2a843621d2421283ff31627134301570f9a5dc49ba1277265085"; + version = "0.7.0.0"; + sha256 = "240aefbab8343ab0c99cdf659e054a0c2c4293f32284b932aa7f3eb4f4cf749f"; libraryHaskellDepends = [ base bytestring containers digestive-functors directory filepath mtl snap-core text @@ -51972,12 +52663,12 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "directory_1_2_6_3" = callPackage + "directory_1_2_7_0" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.2.6.3"; - sha256 = "0f54e0f01f0b2ec739f849d8db6237e3bc52eb1149202b2b4e5c325659228a29"; + version = "1.2.7.0"; + sha256 = "4ae59ebd9969f300e579c2b62fb072954a297b2f53fcd5d58bab363535ce7040"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -53020,6 +53711,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dns_2_0_5" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-builder, conduit, conduit-extra, containers, doctest + , hspec, iproute, mtl, network, random, resourcet, safe, word8 + }: + mkDerivation { + pname = "dns"; + version = "2.0.5"; + sha256 = "b2de8a536e96db022aaa2d368689e8cad7cbd1c8bfb1cc7c56b517e5633a8879"; + libraryHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers iproute mtl network random resourcet safe + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-builder conduit + conduit-extra containers doctest hspec iproute mtl network random + resourcet safe word8 + ]; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dnscache" = callPackage ({ mkDerivation, base, bytestring, containers, contstuff, dns , iproute, time @@ -53544,8 +54259,8 @@ self: { }: mkDerivation { pname = "dotenv"; - version = "0.3.0.2"; - sha256 = "1c53efa4a770ecd359830583b94cab6f26b5c6a6b3bcbe983cd7f37bc7d36303"; + version = "0.3.0.3"; + sha256 = "df2dc890652e6a5dcec035c5050ebc71d8024583d73fe2164fc07b276b640760"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat megaparsec text ]; @@ -54070,6 +54785,8 @@ self: { pname = "drifter-postgresql"; version = "0.0.2"; sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190"; + revision = "1"; + editedCabalFile = "577c35da613b6dface440995d0428e846dc4014764a635b61aa3f4bd83fa2f6b"; libraryHaskellDepends = [ base drifter either mtl postgresql-simple time ]; @@ -54077,6 +54794,7 @@ self: { base drifter either postgresql-simple tasty tasty-hunit text ]; doCheck = false; + homepage = "http://github.com/michaelxavier/drifter-postgresql"; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; }) {}; @@ -55162,7 +55880,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ede" = callPackage + "ede_0_2_8_4" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors , bytestring, comonad, directory, filepath, free, lens, mtl , parsers, scientific, semigroups, tasty, tasty-golden, text @@ -55187,6 +55905,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ede" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors + , bytestring, comonad, directory, filepath, free, lens, mtl + , parsers, scientific, semigroups, tasty, tasty-golden, text + , text-format, text-manipulate, trifecta, unordered-containers + , vector + }: + mkDerivation { + pname = "ede"; + version = "0.2.8.5"; + sha256 = "899e146093fc5353f6e86130898e2396d39c5365a412e67a8435252e8a4f2fb3"; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base bifunctors bytestring comonad directory + filepath free lens mtl parsers scientific semigroups text + text-format text-manipulate trifecta unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring directory tasty tasty-golden text + ]; + homepage = "http://github.com/brendanhay/ede"; + description = "Templating language with similar syntax and features to Liquid or Jinja2"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "edenmodules" = callPackage ({ mkDerivation, base, containers, deepseq, parallel }: mkDerivation { @@ -55273,6 +56016,8 @@ self: { pname = "edit-distance"; version = "0.2.2.1"; sha256 = "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a"; + revision = "1"; + editedCabalFile = "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"; libraryHaskellDepends = [ array base containers random ]; testHaskellDepends = [ array base containers QuickCheck random test-framework @@ -55840,7 +56585,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "ekg-statsd" = callPackage + "ekg-statsd_0_2_0_4" = callPackage ({ mkDerivation, base, bytestring, ekg-core, network, text, time , unordered-containers }: @@ -55855,6 +56600,23 @@ self: { homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ekg-statsd" = callPackage + ({ mkDerivation, base, bytestring, ekg-core, network, text, time + , unordered-containers + }: + mkDerivation { + pname = "ekg-statsd"; + version = "0.2.1.0"; + sha256 = "d042792757f603a8b6d176ed04802b3c4f27079e90bc1ba9b78ea83a666d7711"; + libraryHaskellDepends = [ + base bytestring ekg-core network text time unordered-containers + ]; + homepage = "https://github.com/tibbe/ekg-statsd"; + description = "Push metrics to statsd"; + license = stdenv.lib.licenses.bsd3; }) {}; "electrum-mnemonic" = callPackage @@ -56435,6 +57197,25 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "emailaddress" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, email-validate + , Glob, opaleye, postgresql-simple, product-profunctors + , profunctors, text + }: + mkDerivation { + pname = "emailaddress"; + version = "0.1.0.0"; + sha256 = "97d8dbe96ee77f341cbf1e1f382a3944adc434376bde1a82ea9df3c66be2cdba"; + libraryHaskellDepends = [ + aeson base bytestring email-validate opaleye postgresql-simple + product-profunctors profunctors text + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/emailaddress#readme"; + description = "Wrapper around email-validate library adding instances for common type classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "emailparse" = callPackage ({ mkDerivation, attoparsec, base, bytestring, either , either-unwrap, HUnit, mime, MissingH, mtl, QuickCheck, strptime @@ -56592,6 +57373,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "encoding-io" = callPackage + ({ mkDerivation, base, chunked-data, deepseq, transformers-base }: + mkDerivation { + pname = "encoding-io"; + version = "0.0.1"; + sha256 = "7c567ca9cca8351bfec106ebb9aa79266d48ba7f46cf40d1cac05636985826fb"; + libraryHaskellDepends = [ + base chunked-data deepseq transformers-base + ]; + homepage = "https://github.com/TerrorJack/encoding-io#readme"; + description = "Encoding-aware file I/O"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "endo" = callPackage ({ mkDerivation, base, between, data-default-class, mtl , transformers @@ -56961,6 +57756,28 @@ self: { }: mkDerivation { pname = "envy"; + version = "1.0.0.0"; + sha256 = "0505d8883f796b86f362048b7897bab3cad382f325aa423f743a7cab48064bf4"; + revision = "2"; + editedCabalFile = "4557dbc843b8c588b30d3124f3261fb7ffa2ff705e53ad0d0042c3c4e13ebed3"; + libraryHaskellDepends = [ + base bytestring containers mtl text time transformers + ]; + testHaskellDepends = [ + base bytestring hspec mtl QuickCheck quickcheck-instances text time + transformers + ]; + jailbreak = true; + description = "An environmentally friendly way to deal with environment variables"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "envy_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, hspec, mtl + , QuickCheck, quickcheck-instances, text, time, transformers + }: + mkDerivation { + pname = "envy"; version = "1.1.0.0"; sha256 = "27a2496640ea74ceab5a23a3fe8ef325bfb23d64a851f5dfc18b7c3411beca99"; revision = "1"; @@ -56975,6 +57792,7 @@ self: { jailbreak = true; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epanet-haskell" = callPackage @@ -57164,8 +57982,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.4.0.0"; - sha256 = "1e68f9d15fdc4de5286b9b1bd7a1789f1f7b06d83dbb94ba20f824bce6c14fba"; + version = "0.4.1.1"; + sha256 = "0720b9bfd72a43fc8350e2ddfc57d96b5b1b548d802a1de0a28ca5310fcdf8c0"; libraryHaskellDepends = [ base containers singletons template-haskell th-desugar void ]; @@ -58541,7 +59359,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "expiring-cache-map" = callPackage + "expiring-cache-map_0_0_5_4" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, time , unordered-containers }: @@ -58558,6 +59376,26 @@ self: { homepage = "https://github.com/elblake/expiring-cache-map"; description = "General purpose simple caching"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "expiring-cache-map" = callPackage + ({ mkDerivation, base, bytestring, containers, hashable, time + , unordered-containers + }: + mkDerivation { + pname = "expiring-cache-map"; + version = "0.0.6.1"; + sha256 = "0e3bc294978b46ee59bf0b4a7e7a5bd7ed5da7bc261ffebdb0cb1b60353c64b9"; + libraryHaskellDepends = [ + base containers hashable unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers hashable time unordered-containers + ]; + homepage = "https://github.com/elblake/expiring-cache-map"; + description = "General purpose simple caching"; + license = stdenv.lib.licenses.bsd3; }) {}; "expiring-mvar" = callPackage @@ -58781,6 +59619,8 @@ self: { pname = "extended-reals"; version = "0.2.2.0"; sha256 = "f24538c29ffadf26fb9e3808e0fd5f326623a4d2588d1a985894e951019e9a93"; + revision = "1"; + editedCabalFile = "0d70181cd2955b402bc4ea02edb0cdbd0628ad74f7299f4b692f18a1da0fc7fc"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck test-framework test-framework-hunit @@ -59432,6 +60272,22 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "fathead-util" = callPackage + ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text + }: + mkDerivation { + pname = "fathead-util"; + version = "0.1.0.0"; + sha256 = "a189bfd05292b26eb8e84261358e827b8d8cac56d6cf7c5096a6e94fb3dd5fb8"; + libraryHaskellDepends = [ + base bytestring cassava hxt network-uri text + ]; + jailbreak = true; + homepage = "https://github.com/guiltydolphin/fathead-util"; + description = "Utilities for working with DuckDuckHack's FatHead Instant Answers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fault-tree" = callPackage ({ mkDerivation, base, yices }: mkDerivation { @@ -59458,8 +60314,37 @@ self: { pname = "fay"; version = "0.23.1.12"; sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727"; - revision = "5"; - editedCabalFile = "b156068e9b7eaf0b8362d6f79504f9b9d89ce4b13756b18c92814d41ec9d3d23"; + revision = "6"; + editedCabalFile = "4dd008fc4b03b8fc6e67eff2fb1c42b4f5552529bdd4f63f4290ef25a5327e0b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers data-default + data-lens-light directory filepath ghc-paths haskell-src-exts + language-ecmascript mtl mtl-compat process safe sourcemap split + spoon syb text time transformers transformers-compat + traverse-with-class type-eq uniplate unordered-containers + utf8-string vector + ]; + executableHaskellDepends = [ base mtl optparse-applicative split ]; + homepage = "https://github.com/faylang/fay/wiki"; + description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "fay_0_23_1_14" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , data-default, data-lens-light, directory, filepath, ghc-paths + , haskell-src-exts, language-ecmascript, mtl, mtl-compat + , optparse-applicative, process, safe, sourcemap, split, spoon, syb + , text, time, transformers, transformers-compat + , traverse-with-class, type-eq, uniplate, unordered-containers + , utf8-string, vector + }: + mkDerivation { + pname = "fay"; + version = "0.23.1.14"; + sha256 = "d5f3c6bb8373e35333075c438ba0c48faa0963c6162649780ab55ee5f61a4280"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59471,9 +60356,11 @@ self: { utf8-string vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; + jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -59926,15 +60813,15 @@ self: { , directory, distributed-process, distributed-process-async , distributed-process-client-server, distributed-process-extras , distributed-process-simplelocalnet, exceptions, file-embed - , filepath, fsnotify, HUnit, logging, managed, network-uri - , optparse-applicative, process, reactive-banana, tasty - , tasty-hspec, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , temporary, text, time, transformers, yaml + , filepath, free, fsnotify, HUnit, logging, managed, network-uri + , optparse-applicative, process, reactive-banana, SafeSemaphore + , tasty, tasty-hspec, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, temporary, text, time, transformers, yaml }: mkDerivation { pname = "feed-gipeda"; - version = "0.1.0.4"; - sha256 = "4b93dbf4ced70a60f3dee6efa12f65799923a7d6d79693b7ae5d14dfcf723820"; + version = "0.2.0.0"; + sha256 = "def3da09a8795ea8e86aead8360e86bf4142e0b28f8fb964b152f0ce48f628fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59943,19 +60830,19 @@ self: { distributed-process-async distributed-process-client-server distributed-process-extras distributed-process-simplelocalnet file-embed filepath fsnotify logging network-uri process - reactive-banana temporary text time transformers yaml + reactive-banana SafeSemaphore temporary text time transformers yaml ]; executableHaskellDepends = [ base directory filepath logging optparse-applicative ]; testHaskellDepends = [ async base bytestring conduit conduit-extra directory exceptions - file-embed filepath fsnotify HUnit managed network-uri process - tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-smallcheck - temporary text transformers + file-embed filepath free fsnotify HUnit logging managed network-uri + process tasty tasty-hspec tasty-hunit tasty-quickcheck + tasty-smallcheck temporary text transformers ]; homepage = "http://github.com/sgraf812/feed-gipeda#readme"; - description = "Simple project template from stack"; + description = "CI service around gipeda"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -60247,7 +61134,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fft" = callPackage + "fft_0_1_8_3" = callPackage ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb, transformers }: @@ -60262,6 +61149,24 @@ self: { testHaskellDepends = [ base carray QuickCheck storable-complex ]; description = "Bindings to the FFTW library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + + "fft" = callPackage + ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable + , QuickCheck, storable-complex, syb, transformers + }: + mkDerivation { + pname = "fft"; + version = "0.1.8.4"; + sha256 = "2ea96d3150c1fca6ae2d8f0cead263ea1deddc0be18727a0cf4030f2ef07e1b4"; + libraryHaskellDepends = [ + array base carray ix-shapable storable-complex syb transformers + ]; + libraryPkgconfigDepends = [ fftw fftwFloat ]; + testHaskellDepends = [ base carray QuickCheck storable-complex ]; + description = "Bindings to the FFTW library"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -60510,7 +61415,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "file-modules" = callPackage + "file-modules_0_1_2_3" = callPackage ({ mkDerivation, async, base, directory, filepath, haskell-src-exts , MissingH, regex-compat, regex-pcre }: @@ -60531,6 +61436,30 @@ self: { homepage = "https://github.com/yamadapc/stack-run-auto"; description = "Takes a Haskell source-code file and outputs its modules"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "file-modules" = callPackage + ({ mkDerivation, async, base, directory, filepath, haskell-src-exts + , MissingH, regex-compat, regex-pcre + }: + mkDerivation { + pname = "file-modules"; + version = "0.1.2.4"; + sha256 = "ffea2dbd51f77ed76f8559d8519674a1210611a35e2dbea72dfb41d7d5f0f235"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base directory filepath haskell-src-exts MissingH + regex-compat regex-pcre + ]; + executableHaskellDepends = [ + async base directory filepath haskell-src-exts MissingH + regex-compat regex-pcre + ]; + homepage = "https://github.com/yamadapc/stack-run-auto"; + description = "Takes a Haskell source-code file and outputs its modules"; + license = stdenv.lib.licenses.mit; }) {}; "filecache" = callPackage @@ -62728,6 +63657,35 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "foundation" = callPackage + ({ mkDerivation, base, ghc-prim, mtl, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "foundation"; + version = "0.0.1"; + sha256 = "d2db56431c37247352d2497e1a782197434f02269767584cfebbb740fde69730"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ + base mtl QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "foundation-edge" = callPackage + ({ mkDerivation, base, bytestring, foundation }: + mkDerivation { + pname = "foundation-edge"; + version = "0.0.1"; + sha256 = "8451eff606d689409ba70109a2fc6744ac849c56c0207a47275a4fadcf6ba257"; + libraryHaskellDepends = [ base bytestring foundation ]; + homepage = "https://github.com/haskell-foundation/foundation-edge"; + description = "foundation's edge with the conventional set of packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fountain" = callPackage ({ mkDerivation, base, containers, random }: mkDerivation { @@ -63381,8 +64339,8 @@ self: { }: mkDerivation { pname = "fresco-binding"; - version = "0.1.1"; - sha256 = "4188b09395be7e8ba8b5f6c06a6eafed177e3738cf8337eac7c74e4232e74096"; + version = "0.2.0"; + sha256 = "34a494a812bb61bf875c1442ec5cf9bf9c257e3972b07a7c384ca0870dfca975"; libraryHaskellDepends = [ base bytestring cereal containers messagepack text unix ]; @@ -63447,13 +64405,12 @@ self: { }: mkDerivation { pname = "friday-juicypixels"; - version = "0.1.1"; - sha256 = "f3a96bab73ddb6a26fd3ac705b7dc21e41b55a3027f4727f1e7307262a89207e"; + version = "0.1.2"; + sha256 = "2f8fca7cf49c86af592691bdaaada94ae768a9e054956759a860c9b59ae16ed1"; libraryHaskellDepends = [ base friday JuicyPixels vector ]; testHaskellDepends = [ base bytestring file-embed friday hspec JuicyPixels ]; - jailbreak = true; homepage = "https://github.com/TomMD/friday-juicypixels"; description = "Converts between the Friday and JuicyPixels image types"; license = stdenv.lib.licenses.bsd3; @@ -64562,6 +65519,32 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "gcodehs" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bytestring, containers, formatting, optparse-applicative, pipes + , pipes-aeson, pipes-attoparsec, pipes-bytestring, pipes-parse + , pipes-safe, text + }: + mkDerivation { + pname = "gcodehs"; + version = "0.1.0.0"; + sha256 = "0ff4381453b8aefc09bede0b1a4e15e5bc81e0e6b5c6a3c8d23a8d6faf696db3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base bytestring containers + formatting text + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring optparse-applicative pipes + pipes-aeson pipes-attoparsec pipes-bytestring pipes-parse + pipes-safe text + ]; + homepage = "https://github.com/hackerspace/gcodehs"; + description = "GCode processor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gconf" = callPackage ({ mkDerivation, base, Cabal, GConf, glib, gtk2hs-buildtools, text }: @@ -64891,6 +65874,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.8"; sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb"; + revision = "1"; + editedCabalFile = "7d8da0973a605807887ae7309ff75483ccdaf1735adb2117a67c2721f6452c43"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -65031,8 +66016,10 @@ self: { }: mkDerivation { pname = "generic-random"; - version = "0.1.1.0"; - sha256 = "74780bc4eee28153750b690fd5e4ee46e8f5c2b3c1f35f3e447761a7ca2204a7"; + version = "0.2.0.0"; + sha256 = "f191ee3303d3437dd3f9cc7ebe37e8872f5bcfc4aeb77c9c838d5cd6e594538c"; + revision = "1"; + editedCabalFile = "0232fea4599edb18571d3a167f83978acd12ee1b1bdb1c9a1c3013e5df786b1d"; libraryHaskellDepends = [ ad base containers hashable hmatrix ieee754 MonadRandom mtl QuickCheck transformers unordered-containers vector @@ -65383,8 +66370,8 @@ self: { ({ mkDerivation, base, genvalidity, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.2.0.1"; - sha256 = "0757d0b3be06262b537a04efb45132e1f59629a3b3a387de014dea2d50c8713a"; + version = "0.2.0.4"; + sha256 = "848014573766b08edbb3a5ab043a60ed0fdbe8370b4cfac6a48ef8102cc4d2d2"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -65791,12 +66778,12 @@ self: { }) {}; "ghc-datasize" = callPackage - ({ mkDerivation, base, ghc-heap-view }: + ({ mkDerivation, base, deepseq, ghc-heap-view }: mkDerivation { pname = "ghc-datasize"; - version = "0.1.2"; - sha256 = "03509fe6ed477f850e25b4afc0b54c71d50d70000bf0ca93d719e031b3634d2e"; - libraryHaskellDepends = [ base ghc-heap-view ]; + version = "0.2.0"; + sha256 = "d0077d0b7f8672e0a54c3b265c25075ef447c2053466cb0b9ab012aeb1cfb472"; + libraryHaskellDepends = [ base deepseq ghc-heap-view ]; homepage = "http://felsin9.de/nnis/ghc-datasize"; description = "Determine the size of data structures in GHC's memory"; license = stdenv.lib.licenses.bsd3; @@ -66428,7 +67415,28 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise" = callPackage + "ghc-typelits-knownnat" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra + , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.2"; + sha256 = "ea8363b81b55219ceb037afe349d81c77952969370bf2a9451208679fb0abf8c"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise singletons tasty tasty-hunit + ]; + homepage = "http://clash-lang.org/"; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = stdenv.lib.licenses.bsd2; + }) {}; + + "ghc-typelits-natnormalise_0_4_6" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit }: @@ -66443,6 +67451,24 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-typelits-natnormalise" = callPackage + ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty + , tasty-hunit + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.5"; + sha256 = "3ac6b6c46b41dba1cf06f9dc3a6180939401a318612f81087241dd7bc7e755f5"; + libraryHaskellDepends = [ + base ghc ghc-tcplugins-extra integer-gmp + ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://www.clash-lang.org/"; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = stdenv.lib.licenses.bsd2; }) {}; "ghc-typelits-presburger" = callPackage @@ -66596,7 +67622,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcid" = callPackage + "ghcid_0_6_4" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -66623,6 +67649,36 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghcid" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.6.5"; + sha256 = "67f9f5c89d35f0d56d4d26bf72f25dd2f8794a67949449ef61739e84a316923c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs directory extra filepath process terminal-size time + unix + ]; + executableHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time unix + ]; + testHaskellDepends = [ + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time unix + ]; + doCheck = false; + homepage = "https://github.com/ndmitchell/ghcid#readme"; + description = "GHCi based bare bones IDE"; + license = stdenv.lib.licenses.bsd3; }) {}; "ghcjs-ajax" = callPackage @@ -66904,7 +67960,7 @@ self: { doHaddock = false; preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; @@ -66930,7 +67986,7 @@ self: { doHaddock = false; preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" + PKG_CONFIG_PATH+=":${cairo.dev}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" ''; homepage = "https://github.com/haskell-gi/haskell-gi"; @@ -67635,7 +68691,7 @@ self: { description = "WebKit bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = [ "x86_64-darwin" ]; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "gi-webkit_3_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -67659,7 +68715,7 @@ self: { description = "WebKit bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -67751,8 +68807,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.2.6.0"; - sha256 = "43a575e23753388fe1208bea7c1447e1c17a3b3fc6691c9a12e808f2c7882e26"; + version = "0.2.7.0"; + sha256 = "809944fc799e3238911595ba45a54437a9c206528a37cf60dd4aa98d142bd1ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67782,8 +68838,8 @@ self: { }: mkDerivation { pname = "ginsu"; - version = "0.8.2.1"; - sha256 = "74a94b8573cede5665df7ae25dcc5c53312aea7ece9d4d70857b4c0d572dcbd8"; + version = "0.8.2.2"; + sha256 = "81d4b247b5454245c581a6412d0ac1699c2ff4c64f366a3fa61be3fe3ae43518"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67866,8 +68922,8 @@ self: { }: mkDerivation { pname = "gipeda"; - version = "0.3.2.1"; - sha256 = "e0a9fd77407463537078d69c99cc5a025476b8b2881658eff30346cae35c0118"; + version = "0.3.2.2"; + sha256 = "ce8bea4e3c75cde5296f834bb8e91300b4d3bdad95df4819d9e43b4c414f61c7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68047,22 +69103,22 @@ self: { , directory, disk-free-space, dlist, dns, edit-distance, esqueleto , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , json, lsof, magic, MissingH, monad-control, monad-logger - , mountpoints, mtl, network, network-info, network-multicast + , lsof, magic, MissingH, monad-control, monad-logger, mountpoints + , mtl, network, network-info, network-multicast , network-protocol-xmpp, network-uri, old-locale, openssh , optparse-applicative, path-pieces, perl, persistent , persistent-sqlite, persistent-template, process, QuickCheck , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck , tasty-rerun, template-haskell, text, time, torrent, transformers - , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp - , warp-tls, wget, which, xml-types, yesod, yesod-core - , yesod-default, yesod-form, yesod-static + , unix, unix-compat, unordered-containers, utf8-string, uuid, wai + , wai-extra, warp, warp-tls, wget, which, xml-types, yesod + , yesod-core, yesod-default, yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20160619"; - sha256 = "5acc80dfb86d8f568819256a428f04794bff4c654389692f27a7bf0877ebe12f"; + version = "6.20160808"; + sha256 = "c729decece3dfc05366879b72328b5ebe4a86e77a32f634fcfa4dbebbb8799fd"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -68081,20 +69137,21 @@ self: { conduit-extra containers crypto-api cryptonite data-default DAV dbus directory disk-free-space dlist dns edit-distance esqueleto exceptions fdo-notify feed filepath gnutls hinotify hslogger - http-client http-conduit http-types IfElse json magic MissingH + http-client http-conduit http-types IfElse magic MissingH monad-control monad-logger mountpoints mtl network network-info network-multicast network-protocol-xmpp network-uri old-locale optparse-applicative path-pieces persistent persistent-sqlite persistent-template process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat utf8-string uuid wai wai-extra warp - warp-tls xml-types yesod yesod-core yesod-default yesod-form - yesod-static + transformers unix unix-compat unordered-containers utf8-string uuid + wai wai-extra warp warp-tls xml-types yesod yesod-core + yesod-default yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which ]; + jailbreak = true; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; @@ -68364,15 +69421,15 @@ self: { "gitHUD" = callPackage ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, unix + , tasty-quickcheck, tasty-smallcheck, text, unix }: mkDerivation { pname = "gitHUD"; - version = "1.3.3"; - sha256 = "c9868144e8fd72604a79cb6543d1099b931cdd8ce527319dd1f9294850d4b2d3"; + version = "1.3.4"; + sha256 = "8c2273f0d2af162915291e3180f1910dfa76813be9cb7676c53fde112e8ad355"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl parsec process unix ]; + libraryHaskellDepends = [ base mtl parsec process text unix ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck @@ -68949,6 +70006,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glabrous" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , directory, either, hspec, text, unordered-containers + }: + mkDerivation { + pname = "glabrous"; + version = "0.1.2.0"; + sha256 = "ae66cf3c83a8da0095715aee111cd6e834c37501128e39adfb0e0eb2a90a70ad"; + libraryHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring either text + unordered-containers + ]; + testHaskellDepends = [ + base directory either hspec text unordered-containers + ]; + homepage = "https://github.com/MichelBoucey/glabrous"; + description = "A template library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "glade" = callPackage ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, libglade }: mkDerivation { @@ -69119,22 +70196,24 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, Cabal , config-value, connection, containers, data-default-class, deepseq - , directory, filepath, hashable, lens, memory, network, profunctors - , split, stm, text, text-icu, time, tls, transformers - , unordered-containers, vector, vty, x509, x509-store, x509-system + , directory, filepath, gitrev, hashable, irc-core, lens, network + , regex-tdfa, regex-tdfa-text, split, stm, text, time, tls + , transformers, unix, unordered-containers, vector, vty, x509 + , x509-store, x509-system }: mkDerivation { pname = "glirc"; - version = "2.2"; - sha256 = "b543a8c1193d8f436984bf4d68cd88f9df4305f144778605b15623b470c1cd07"; + version = "2.9"; + sha256 = "7328b69803806ebdc80c938efc70fc687d64ecc6343b99562afe95c9d60ae2ab"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal ]; executableHaskellDepends = [ async attoparsec base bytestring config-value connection containers - data-default-class deepseq directory filepath hashable lens memory - network profunctors split stm text text-icu time tls transformers - unordered-containers vector vty x509 x509-store x509-system + data-default-class deepseq directory filepath gitrev hashable + irc-core lens network regex-tdfa regex-tdfa-text split stm text + time tls transformers unix unordered-containers vector vty x509 + x509-store x509-system ]; homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; @@ -75197,7 +76276,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddocset" = callPackage + "haddocset_0_4_1" = callPackage ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory , exceptions, filepath, ghc, haddock-api, http-types, mtl , optparse-applicative, process, resourcet, sqlite-simple, tagsoup @@ -75220,6 +76299,29 @@ self: { homepage = "https://github.com/philopon/haddocset"; description = "Generate docset of Dash by Haddock haskell documentation tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haddocset" = callPackage + ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory + , exceptions, filepath, ghc, haddock-api, http-types, mtl + , optparse-applicative, process, resourcet, sqlite-simple, tagsoup + , text, transformers + }: + mkDerivation { + pname = "haddocset"; + version = "0.4.2"; + sha256 = "a8f687bb96989a85dc56a208e04bde55f4a6c4473d6ff42ff2ae0d6a62511290"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal conduit conduit-extra directory exceptions filepath ghc + haddock-api http-types mtl optparse-applicative process resourcet + sqlite-simple tagsoup text transformers + ]; + homepage = "https://github.com/philopon/haddocset"; + description = "Generate docset of Dash by Haddock haskell documentation tool"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -77409,6 +78511,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hascas" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, hspec, mtl, network, stm, template-haskell + , uuid + }: + mkDerivation { + pname = "hascas"; + version = "0.1.0.0"; + sha256 = "25dc79e9e8798d35932b1f8729330a1863fe93278778e4a3265c9a0dba504ccd"; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 mtl network + stm template-haskell uuid + ]; + testHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 hspec mtl + network stm template-haskell uuid + ]; + homepage = "https://github.com/eklavya/hascas#readme"; + description = "Cassandra driver for haskell"; + license = stdenv.lib.licenses.asl20; + }) {}; + "hascat" = callPackage ({ mkDerivation, base, bytestring, hascat-lib, hascat-setup , hascat-system, HaXml, haxr, html, HTTP, network, unix @@ -78122,28 +79246,41 @@ self: { "haskell-docs" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Cabal , containers, cryptohash, directory, filepath, ghc, ghc-paths - , haddock-api, monad-loops, process, text, unordered-containers + , haddock-api, haddock-library, monad-loops, process, text + , unordered-containers }: mkDerivation { pname = "haskell-docs"; - version = "4.2.6"; - sha256 = "729293f120ddaacab6814f8c6735e3f9ca9fd88c2453e2b887f5a806cd4dbeba"; + version = "4.2.7"; + sha256 = "e82a15f6e8b6572754036427af862981d5fc22904b0c3af4d6fddc63fb1463d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring bytestring Cabal containers cryptohash - directory filepath ghc ghc-paths haddock-api monad-loops process - text unordered-containers + directory filepath ghc ghc-paths haddock-api haddock-library + monad-loops process text unordered-containers ]; executableHaskellDepends = [ base ghc text ]; testHaskellDepends = [ base ]; - jailbreak = true; - homepage = "http://github.com/chrisdone/haskell-docs"; + homepage = "http://github.com/ivan-m/haskell-docs"; description = "A program to find and display the docs and type of a name"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "haskell-eigen-util" = callPackage + ({ mkDerivation, base, eigen, vector }: + mkDerivation { + pname = "haskell-eigen-util"; + version = "0.1.0.4"; + sha256 = "0ba52c28e224551368a6129421e4e5a81c47db0c5d50399adb3dadbe9d6f5d9b"; + libraryHaskellDepends = [ base eigen vector ]; + testHaskellDepends = [ base eigen vector ]; + homepage = "https://github.com/dilawar/haskell-eigen-util#README.md"; + description = "Some utility functions for haskell-eigen library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-exp-parser" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -78349,6 +79486,29 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskell-igraph" = callPackage + ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs + , colour, data-default-class, hashable, hxt, igraph, primitive + , random, split, tasty, tasty-golden, tasty-hunit + , unordered-containers + }: + mkDerivation { + pname = "haskell-igraph"; + version = "0.1.0"; + sha256 = "fc335506a48d1479ed59eeaf5c073e682c380c61360293188d84d5c0a232e21f"; + libraryHaskellDepends = [ + base binary bytestring bytestring-lexing colour data-default-class + hashable hxt primitive split unordered-containers + ]; + librarySystemDepends = [ igraph ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base random tasty tasty-golden tasty-hunit + ]; + description = "Imcomplete igraph bindings"; + license = stdenv.lib.licenses.mit; + }) {igraph = null;}; + "haskell-import-graph" = callPackage ({ mkDerivation, base, classy-prelude, ghc, graphviz, process, text , transformers @@ -78762,27 +79922,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haskell-src-exts_1_15_0_1" = callPackage - ({ mkDerivation, array, base, containers, cpphs, directory - , filemanip, filepath, ghc-prim, happy, mtl, pretty, smallcheck - , syb, tasty, tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; - version = "1.15.0.1"; - sha256 = "85f475693a87fd26a3a8b32dea2660bfdca35c2b5d11506ab11b1dc20c88e576"; - libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filemanip filepath mtl smallcheck syb - tasty tasty-golden tasty-smallcheck - ]; - homepage = "https://github.com/haskell-suite/haskell-src-exts"; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-src-exts" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck @@ -78827,6 +79966,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-src-exts-prisms" = callPackage + ({ mkDerivation, base, haskell-src-exts, lens, template-haskell }: + mkDerivation { + pname = "haskell-src-exts-prisms"; + version = "1.18.2.0"; + sha256 = "5b731238acbd9aa50337d3f4ca18199e6a76825596ba48628ef623ccdeacf399"; + libraryHaskellDepends = [ + base haskell-src-exts lens template-haskell + ]; + jailbreak = true; + homepage = "https://github.com/DanielWaterworth/haskell-src-exts-prisms"; + description = "Prisms with newtype wrappers for haskell-src-exts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-src-exts-qq" = callPackage ({ mkDerivation, base, haskell-src-exts, haskell-src-meta, hspec , syb, template-haskell @@ -78847,8 +80001,8 @@ self: { ({ mkDerivation, base, haskell-src-exts }: mkDerivation { pname = "haskell-src-exts-simple"; - version = "1.18.0.1"; - sha256 = "5d2193a64b6979e541a2897fffbd4c57c420b41d386b4fb24c817921f97a0715"; + version = "1.18.0.1.1"; + sha256 = "f331ae82547ebc4ee1dfce9265e101117ff6951682d0eea79c03a2994b9c061b"; libraryHaskellDepends = [ base haskell-src-exts ]; jailbreak = true; homepage = "https://github.com/int-e/haskell-src-exts-simple"; @@ -79737,6 +80891,8 @@ self: { pname = "haskintex"; version = "0.6.0.1"; sha256 = "9b45463a0d77e8665cc82b656b6d9f8020c873d73f2dd9fe92fcb85a45e90f44"; + revision = "1"; + editedCabalFile = "8a16e2748e754c6fe0d7bd20186166b46819b12c6853c1275fda55e56d8ef8c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80253,7 +81409,7 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) aspell;}; - "hasql" = callPackage + "hasql_0_19_14" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras , data-default-class, dlist, either, hashable, hashtables, loch-th @@ -80281,6 +81437,37 @@ self: { homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hasql" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , data-default-class, dlist, either, hashable, hashtables, loch-th + , mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.15"; + sha256 = "cbcec81cdd852325dddf3b9cbf830b94f63d4037adf5b9b84ac683384614b4e3"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring + bytestring-tree-builder contravariant contravariant-extras + data-default-class dlist either hashable hashtables loch-th mtl + placeholders postgresql-binary postgresql-libpq profunctors + scientific semigroups text time transformers uuid vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + doCheck = false; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "A very efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; }) {}; "hasql-backend" = callPackage @@ -80309,8 +81496,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-query"; - version = "0.4"; - sha256 = "f1456233ced567b884edfebe2a8a4e2e8367bd258d850ae9811072ab86f3a55d"; + version = "0.4.1"; + sha256 = "9f0b1bf2ea1634f2f2da0727bfab331722c71573a3574f65423cada54da7c902"; libraryHaskellDepends = [ base base-prelude bytestring contravariant foldl hasql hasql-cursor-transaction hasql-transaction profunctors @@ -80331,8 +81518,8 @@ self: { }: mkDerivation { pname = "hasql-cursor-transaction"; - version = "0.5.0.1"; - sha256 = "6e4a064b2d108ba5d94250045faa347f07b9337849438c09b2f8cb5466ac5465"; + version = "0.6"; + sha256 = "07b991914a5664378ab358536ba36ea9c54f7771c41c7eed6688053fa289c2f6"; libraryHaskellDepends = [ base base-prelude bytestring bytestring-tree-builder contravariant hasql hasql-transaction transformers @@ -80689,6 +81876,34 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "hats" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, conduit-extra, connection, deepseq, HUnit, network + , network-uri, process, QuickCheck, random, stm, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "hats"; + version = "0.1.0.0"; + sha256 = "58f6f63fd02049fedd7e2c474ffcb01f1d0ba8129477550afffb7167ca7841c8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit conduit-extra + connection deepseq network network-uri random stm text transformers + unordered-containers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson attoparsec base bytestring HUnit process QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "https://github.com/kosmoskatten/hats"; + description = "Haskell client for the NATS messaging system"; + license = stdenv.lib.licenses.mit; + }) {}; + "hatt" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cmdargs, containers , haskeline, parsec, QuickCheck, test-framework @@ -80862,7 +82077,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "haxr" = callPackage + "haxr_3000_11_1_6" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams , http-types, io-streams, mtl, mtl-compat, network, network-uri @@ -80881,6 +82096,28 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "haxr" = callPackage + ({ mkDerivation, array, base, base-compat, base64-bytestring + , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams + , http-types, io-streams, mtl, mtl-compat, network, network-uri + , old-locale, old-time, template-haskell, text, time, utf8-string + }: + mkDerivation { + pname = "haxr"; + version = "3000.11.2"; + sha256 = "ebcda06d7ee79d5e635a7ec34f86400dd54ddd2434eda082aac6d3c8fd6e8b47"; + libraryHaskellDepends = [ + array base base-compat base64-bytestring blaze-builder bytestring + HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat + network network-uri old-locale old-time template-haskell text time + utf8-string + ]; + homepage = "http://www.haskell.org/haskellwiki/HaXR"; + description = "XML-RPC client and server library"; + license = stdenv.lib.licenses.bsd3; }) {}; "haxr-th" = callPackage @@ -81575,7 +82812,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdevtools" = callPackage + "hdevtools_0_1_3_2" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc , ghc-boot, ghc-paths, network, process, syb, time, transformers , unix @@ -81593,6 +82830,27 @@ self: { homepage = "https://github.com/hdevtools/hdevtools/"; description = "Persistent GHC powered background server for FAST haskell development tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hdevtools" = callPackage + ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc + , ghc-boot, ghc-paths, network, process, syb, time, transformers + , unix + }: + mkDerivation { + pname = "hdevtools"; + version = "0.1.4.0"; + sha256 = "2d0b267b80a90a9b0e2b027d0d8af2e819414f68c187e6bba1c288fbe13bc595"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths + network process syb time transformers unix + ]; + homepage = "https://github.com/hdevtools/hdevtools/"; + description = "Persistent GHC powered background server for FAST haskell development tools"; + license = stdenv.lib.licenses.mit; }) {}; "hdf" = callPackage @@ -81903,8 +83161,8 @@ self: { }: mkDerivation { pname = "heckle"; - version = "2.0.0.3"; - sha256 = "f0d4214ae4de15ba61264c8cd2ecbad5ea8c6955aba73349f230a10311978918"; + version = "2.0.0.4"; + sha256 = "cd6664f6b969d0f884a2826b7faeed0bd40bdfd99a74521aad080c706d827320"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81942,21 +83200,22 @@ self: { }) {}; "hedis" = callPackage - ({ mkDerivation, base, bytestring, bytestring-lexing, deepseq - , HUnit, mtl, network, resource-pool, scanner, slave-thread - , test-framework, test-framework-hunit, text, time, vector + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, HUnit, mtl, network, resource-pool, scanner + , slave-thread, stm, test-framework, test-framework-hunit, text + , time, unordered-containers, vector }: mkDerivation { pname = "hedis"; - version = "0.9.1"; - sha256 = "bb2422ab8cb05c6854e1d339e9117108ad9591d18a76be9dcb4cbd2e6021b08d"; + version = "0.9.3"; + sha256 = "2d3748fe7c88b3b7341e6fdd3632c4594b01e7c5fe7c395ea5fc74235e1f92d0"; libraryHaskellDepends = [ - base bytestring bytestring-lexing deepseq mtl network resource-pool - scanner text time vector + async base bytestring bytestring-lexing deepseq mtl network + resource-pool scanner stm text time unordered-containers vector ]; testHaskellDepends = [ - base bytestring HUnit mtl slave-thread test-framework - test-framework-hunit time + async base bytestring HUnit mtl slave-thread stm test-framework + test-framework-hunit text time ]; doCheck = false; homepage = "https://github.com/informatikr/hedis"; @@ -82112,7 +83371,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "heist" = callPackage + "heist_0_14_1_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , bytestring, containers, directory, directory-tree, dlist, either , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl @@ -82133,6 +83392,50 @@ self: { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "heist" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder + , blaze-html, bytestring, containers, criterion, directory + , directory-tree, dlist, errors, filepath, hashable, HUnit, lens + , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck + , random, statistics, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, time, transformers + , transformers-base, unordered-containers, vector, xmlhtml + }: + mkDerivation { + pname = "heist"; + version = "1.0.0.0"; + sha256 = "6c637ee835488dc716bf6fd929ea4de12578119ccf07766cb601910d160fec4f"; + revision = "2"; + editedCabalFile = "6da6ec8736d1cb25caa9ca7b82e0eab1ebd2c99804fa7ac23b933589f550a637"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers directory directory-tree dlist filepath hashable + lifted-base map-syntax monad-control mtl process random text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + executableHaskellDepends = [ + aeson attoparsec base blaze-builder blaze-html bytestring + containers criterion directory directory-tree dlist errors filepath + hashable HUnit lifted-base map-syntax monad-control mtl process + random statistics test-framework test-framework-hunit text time + transformers transformers-base unordered-containers vector xmlhtml + ]; + testHaskellDepends = [ + aeson attoparsec base bifunctors blaze-builder blaze-html + bytestring containers directory directory-tree dlist errors + filepath hashable HUnit lens lifted-base map-syntax monad-control + mtl process QuickCheck random test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unordered-containers vector xmlhtml + ]; + homepage = "http://snapframework.com/"; + description = "An Haskell template system supporting both HTML5 and XML"; + license = stdenv.lib.licenses.bsd3; }) {}; "heist-aeson" = callPackage @@ -83467,14 +84770,14 @@ self: { }) {}; "hgeos" = callPackage - ({ mkDerivation, base, geos_c, MissingH, mtl, transformers }: + ({ mkDerivation, base, geos_c, MissingH }: mkDerivation { pname = "hgeos"; - version = "0.1.5.1"; - sha256 = "7a9160fd2f575e84c6b18de2e2721497a392b161412516fc61622885d5fdce5d"; - libraryHaskellDepends = [ base transformers ]; + version = "0.1.8.0"; + sha256 = "e7937a4f26ad057720f215ff51969972b4dd44ca1d817242377e3adb97c2d891"; + libraryHaskellDepends = [ base ]; librarySystemDepends = [ geos_c ]; - testHaskellDepends = [ base MissingH mtl transformers ]; + testHaskellDepends = [ base MissingH ]; homepage = "https://github.com/rcook/hgeos#readme"; description = "Simple Haskell bindings to GEOS C API"; license = stdenv.lib.licenses.mit; @@ -83544,8 +84847,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp, QuickCheck }: mkDerivation { pname = "hgmp"; - version = "0.1.0.0"; - sha256 = "dc72eae07df9c94c1cc404cb823a0cde3a19dc7e640eef35b1b05f1218831fbc"; + version = "0.1.0.1"; + sha256 = "51f63355e712854dd3b5785accef36fdca2538f443fd6690d8276a32e8b86c3a"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://code.mathr.co.uk/hgmp"; @@ -84089,6 +85392,8 @@ self: { pname = "hindent"; version = "4.6.4"; sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf"; + revision = "1"; + editedCabalFile = "f0a60118bc1676b194de34b26a83a11f62ff91b557c8ef0e1da737a7923e0642"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84106,6 +85411,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hindent_5_0_0" = callPackage + ({ mkDerivation, base, containers, descriptive, directory, ghc-prim + , haskell-src-exts, hspec, monad-loops, mtl, text, transformers + }: + mkDerivation { + pname = "hindent"; + version = "5.0.0"; + sha256 = "ad2f652d086e7bd8dd933b3aed682fd811bcb081b367279097f9d384dd738d77"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers haskell-src-exts monad-loops mtl text transformers + ]; + executableHaskellDepends = [ + base descriptive directory ghc-prim haskell-src-exts text + ]; + testHaskellDepends = [ + base directory haskell-src-exts hspec monad-loops mtl text + ]; + jailbreak = true; + homepage = "http://www.github.com/chrisdone/hindent"; + description = "Extensible Haskell pretty printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hindley-milner" = callPackage ({ mkDerivation, base, containers, data-fix, hspec, mtl , transformers @@ -84310,7 +85641,6 @@ self: { homepage = "https://github.com/mvdan/hint"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hint-server" = callPackage @@ -84828,8 +86158,8 @@ self: { }: mkDerivation { pname = "hjsonpointer"; - version = "0.3.0.2"; - sha256 = "caf6f9df4af27b0dae0bc0c39be4eb623743f70602df251fd5e9fb1732795747"; + version = "1.0.0.0"; + sha256 = "0ba6ab283e9d465de61c1d171e7c78c78c5e06b061c125a63e2eee0201a01739"; libraryHaskellDepends = [ aeson base QuickCheck text unordered-containers vector ]; @@ -84851,8 +86181,8 @@ self: { }: mkDerivation { pname = "hjsonschema"; - version = "1.1.0.0"; - sha256 = "63c5ca58ae62475bf2dbaa9ab87fda7f758676dca7a2b13790ee832cd027b5b8"; + version = "1.1.0.1"; + sha256 = "52e85f98ace68a20ad1435b56c0d201a5cbb8c475dd3086aee860aa72da3824d"; libraryHaskellDepends = [ aeson base bytestring containers file-embed filepath hjsonpointer http-client http-types pcre-heavy profunctors QuickCheck scientific @@ -85384,15 +86714,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_1_9_36" = callPackage + "hlint_1_9_37" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs , directory, extra, filepath, haskell-src-exts, hscolour, process , refact, transformers, uniplate }: mkDerivation { pname = "hlint"; - version = "1.9.36"; - sha256 = "dfcd31ce03590f20c1dcea4e78756329e97cccbddbf76db976b3392bd276addc"; + version = "1.9.37"; + sha256 = "a208466a837b58159d6a4bbd4c360ae918da306fb38630eae52ba5ef0c88c415"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87051,8 +88381,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.19.1"; - sha256 = "c0cec5475247b9150d8ec9e58b337754767c306ea4f6fc7572ff82f8e5ff4b2e"; + version = "0.19.2"; + sha256 = "6bcc067bfc2b54c0c47ea7169f3741ec8f64abee9bd8c398191a0b35520fa39c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -87580,6 +88910,8 @@ self: { pname = "hpack"; version = "0.14.1"; sha256 = "a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280"; + revision = "1"; + editedCabalFile = "59a63c997869623189c5e2bb3df8b1da09dda3a2258cbef43a87cbb4a40addc5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -87600,6 +88932,71 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack-convert" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , Cabal, containers, deepseq, directory, filepath, Glob, hspec + , interpolate, mockery, pretty, QuickCheck, temporary, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack-convert"; + version = "0.14.4"; + sha256 = "dff7716b20bbe03e9b96d4051becb0ece42315c926e8b5999782a2566ed879d1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring Cabal containers deepseq + directory filepath Glob pretty text unordered-containers vector + yaml + ]; + executableHaskellDepends = [ + aeson base base-compat bytestring Cabal containers deepseq + directory filepath Glob pretty text unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring Cabal containers deepseq + directory filepath Glob hspec interpolate mockery pretty QuickCheck + temporary text unordered-containers vector yaml + ]; + homepage = "https://github.com/yamadapc/hpack-convert#readme"; + description = "Convert Cabal manifests into hpack's package.yamls"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hpack-convert_0_14_5" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , Cabal, containers, deepseq, directory, filepath, Glob, hspec + , interpolate, mockery, pretty, QuickCheck, temporary, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack-convert"; + version = "0.14.5"; + sha256 = "fddb0bbb0a0aeb7362ee4333fb15f5d90191a6163698d596aead89577b4656ae"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring Cabal containers deepseq + directory filepath Glob pretty text unordered-containers vector + yaml + ]; + executableHaskellDepends = [ + aeson base base-compat bytestring Cabal containers deepseq + directory filepath Glob pretty text unordered-containers vector + yaml + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring Cabal containers deepseq + directory filepath Glob hspec interpolate mockery pretty QuickCheck + temporary text unordered-containers vector yaml + ]; + homepage = "https://github.com/yamadapc/hpack-convert#readme"; + description = "Convert Cabal manifests into hpack's package.yamls"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpaco" = callPackage ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict , utf8-string, yaml @@ -88795,6 +90192,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-watchman" = callPackage + ({ mkDerivation, async, base, binary, bytestring, containers + , filepath, network, process, tasty, tasty-hunit, temporary + }: + mkDerivation { + pname = "hs-watchman"; + version = "0.0.0.3"; + sha256 = "d1cd8bda7c98111f8e20850a49587e1970b8593b9e2572070011cde61fa110b3"; + libraryHaskellDepends = [ + async base binary bytestring containers filepath network process + temporary + ]; + testHaskellDepends = [ + base bytestring containers filepath tasty tasty-hunit temporary + ]; + jailbreak = true; + homepage = "https://github.com/bitc/hs-watchman"; + description = "Client library for Facebook's Watchman tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "hs2048" = callPackage ({ mkDerivation, base, doctest, Glob, hlint, hspec, HUnit, process , QuickCheck, random, regex-compat @@ -89574,6 +90992,8 @@ self: { pname = "hsdev"; version = "0.2.0.0"; sha256 = "da36361df0f56f5e217da972cd4a9e2a0f3321be684c365f9d599fb635f7b02e"; + revision = "1"; + editedCabalFile = "80d4e37bb93542afb3b7bf1496862fde3f1aef17e2d569f9c290fb7c861040ae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89668,6 +91088,8 @@ self: { pname = "hse-cpp"; version = "0.1"; sha256 = "a075790dd132107b8005478179fcaf7e37a78c3011ca536ff0d95e0b437c2b38"; + revision = "1"; + editedCabalFile = "9ed587127e9760a075bf6ea478997e1a1fb9e500102bd883206aa843e7d92a4b"; libraryHaskellDepends = [ base cpphs haskell-src-exts ]; description = "Preprocess+parse haskell code"; license = stdenv.lib.licenses.mit; @@ -89944,8 +91366,8 @@ self: { }: mkDerivation { pname = "hsimport"; - version = "0.7.1"; - sha256 = "f4029909e893376e4c3d715d45537d52dbf0b90eeca2dcf9c33f3440919aba6b"; + version = "0.8.2"; + sha256 = "0c66301edd1225d92271d9235b847a0c8bf526bc49865852adef1f355bfd5937"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89956,6 +91378,7 @@ self: { testHaskellDepends = [ base filepath haskell-src-exts tasty tasty-golden ]; + jailbreak = true; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -90400,8 +91823,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.2.7"; - sha256 = "0f00e2d8a1294da1e60077b5da641a2f089326eaeb8766eb6e2eb1622328b6a7"; + version = "0.2.8"; + sha256 = "fa843d3ed104a61c2750d333e851048e6677e0f0713c74117c2fb8def8eaa3fe"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -90630,6 +92053,45 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "hspec-golden-aeson" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory + , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt + , random, silently, transformers + }: + mkDerivation { + pname = "hspec-golden-aeson"; + version = "0.1.0.0"; + sha256 = "c6faaabdce29fdc8b25e2f35e90698eeee0601a690b22b16aca6a1f431bbca65"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring directory filepath hspec + QuickCheck quickcheck-arbitrary-adt random transformers + ]; + testHaskellDepends = [ + aeson base directory hspec hspec-core QuickCheck + quickcheck-arbitrary-adt silently transformers + ]; + homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; + description = "Use tests to monitor changes in Aeson serialization"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "hspec-hashable" = callPackage + ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck + , silently + }: + mkDerivation { + pname = "hspec-hashable"; + version = "0.1.0.0"; + sha256 = "11cc546fc714d7e084d251577a3e6e5238309144f536914411f58c69a6e014bf"; + libraryHaskellDepends = [ base hashable hspec QuickCheck ]; + testHaskellDepends = [ + base hashable hspec hspec-core QuickCheck silently + ]; + homepage = "https://github.com/plow-technologies/hspec-hashable#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hspec-jenkins" = callPackage ({ mkDerivation, base, blaze-markup, hspec }: mkDerivation { @@ -90801,7 +92263,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-snap" = callPackage + "hspec-snap_0_4_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core , hxt, lens, mtl, snap, snap-core, text, transformers @@ -90826,6 +92288,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hspec-snap" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , digestive-functors, directory, HandsomeSoup, hspec, hspec-core + , hxt, lens, mtl, snap, snap-core, text, transformers + }: + mkDerivation { + pname = "hspec-snap"; + version = "1.0.0.0"; + sha256 = "e3afa22d1c68a9db41463b115f432ac01d80fee706ae58bf2cf00d6d4f7b0e65"; + libraryHaskellDepends = [ + aeson base bytestring containers digestive-functors HandsomeSoup + hspec hspec-core hxt lens mtl snap snap-core text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers digestive-functors directory + HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text + transformers + ]; + homepage = "https://github.com/dbp/hspec-snap"; + description = "A library for testing with Hspec and the Snap Web Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-stack-rerun" = callPackage ({ mkDerivation, base, directory, hspec, safe, strict }: mkDerivation { @@ -91266,6 +92752,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hsrelp" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, network, utf8-string + }: + mkDerivation { + pname = "hsrelp"; + version = "0.1.0.1"; + sha256 = "8175a950537100b7c997d9abb4334f9313a707d7bb6d64f746b3314b069d91b1"; + libraryHaskellDepends = [ + attoparsec base bytestring network utf8-string + ]; + homepage = "https://github.com/verrens/hsrelp"; + description = "RELP (Reliable Event Logging Protocol) server implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hsseccomp" = callPackage ({ mkDerivation, base, seccomp, tasty, tasty-hunit, unix }: mkDerivation { @@ -91765,6 +93266,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htestu" = callPackage + ({ mkDerivation, base, gcc, random }: + mkDerivation { + pname = "htestu"; + version = "0.1.1.2"; + sha256 = "d67c265aff02e0a203df5dced00c2ef432154c206fa6b33cabc684afef40254f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random ]; + libraryToolDepends = [ gcc ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/nkartashov/htestu"; + description = "A library for testing correctness of pseudo random number generators in Haskell"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) gcc;}; + "htiled" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , filepath, hxt, split, zlib @@ -92896,6 +94413,8 @@ self: { snap-core snap-server system-fileio system-filepath text transformers unordered-containers ]; + jailbreak = true; + doCheck = false; homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; @@ -92976,7 +94495,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "http2" = callPackage + "http2_1_6_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, case-insensitive, containers, directory , doctest, filepath, Glob, hex, hspec, psqueues, stm, text @@ -92997,6 +94516,30 @@ self: { ]; description = "HTTP/2.0 library including frames and HPACK"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , bytestring-builder, case-insensitive, containers, directory + , doctest, filepath, Glob, hex, hspec, psqueues, stm, text + , unordered-containers, vector, word8 + }: + mkDerivation { + pname = "http2"; + version = "1.6.2"; + sha256 = "99e75ac0fa19276d276ec63bb94eefb2e952b0a374aea8f3d2c2408a634b6fe7"; + libraryHaskellDepends = [ + array base bytestring bytestring-builder case-insensitive + containers psqueues stm + ]; + testHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + case-insensitive containers directory doctest filepath Glob hex + hspec psqueues stm text unordered-containers vector word8 + ]; + description = "HTTP/2.0 library including frames and HPACK"; + license = stdenv.lib.licenses.bsd3; }) {}; "httpd-shed" = callPackage @@ -93613,8 +95156,8 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.0.0.10"; - sha256 = "c02e7398bbac3e1e92060b6bfb4245a5c6252a213ed3a2b918836b99515468ea"; + version = "0.0.0.12"; + sha256 = "db8888878caa8a7e69595528147737794b1621f9b05fc0be7b308aa1a2b531d8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; @@ -93651,7 +95194,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "hw-diagnostics" = callPackage + "hw-diagnostics_0_0_0_2" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "hw-diagnostics"; @@ -93665,6 +95208,23 @@ self: { homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hw-diagnostics" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "hw-diagnostics"; + version = "0.0.0.3"; + sha256 = "e69688c5cc40280cb0eaabb23ee36416fc794d88473e53fb8973359cc21fef43"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; }) {}; "hw-json_0_0_0_2" = callPackage @@ -93800,8 +95360,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.0.3.5"; - sha256 = "dd6f4b25ad1180c2706323451e2f2663f977353678945319ccc59b61f008db10"; + version = "0.0.3.8"; + sha256 = "38684ac8dc3ecc4effe4e8f27fda4f5d515fd54b0d695f9eb30c24a5eac4038f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring random vector ]; @@ -93839,8 +95399,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.1.0.1"; - sha256 = "57a11f88cfe37be4d18ce5f9497a139bd2e7eb2b9e25b8413c602da2f0f41d5c"; + version = "0.2.0.1"; + sha256 = "6ded1738898c3549336faf296d78c74ec9089b5610c2e07c09cc2963e02787af"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hw-bits hw-prim vector ]; @@ -94996,6 +96556,8 @@ self: { pname = "i18n"; version = "0.3"; sha256 = "37e012104ab07255ae4f45490af8795d743e24857e83c38dd1dddaf0984a3f50"; + revision = "1"; + editedCabalFile = "d439935bdde42851690657019ef6fe3a9869299d918ed04db2e6752614608d36"; libraryHaskellDepends = [ array base containers directory filepath mtl old-locale old-time parsec utf8-string @@ -95376,6 +96938,26 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "idringen" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , http-conduit, MissingH, process, transformers + }: + mkDerivation { + pname = "idringen"; + version = "0.1.0.1"; + sha256 = "28b154c9f991f86cdbfb7cd563e51de5c5a6b7fb65e80de4b2e50dae75881014"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath http-conduit MissingH process + transformers + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/zjhmale/idringen"; + description = "A project manage tool for Idris"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "idris_0_11_2" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, async, base, base64-bytestring, binary @@ -95426,15 +97008,16 @@ self: { , blaze-html, blaze-markup, bytestring, cheapskate, containers , deepseq, directory, filepath, fingertree, fsnotify, gmp , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, regex-tdfa, safe, split, terminal-size - , text, time, transformers, transformers-compat, trifecta, uniplate - , unix, unordered-containers, utf8-string, vector + , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty + , tasty-golden, tasty-rerun, terminal-size, text, time + , transformers, transformers-compat, trifecta, uniplate, unix + , unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.12.1"; - sha256 = "2d3e4d1768975db5f786796d0d9a98037c011a3bf7765e41b17aa585680a49bb"; + version = "0.12.2"; + sha256 = "7df31d4eae5aabdd11b6940aeed89693f9c49f01826e7355bf80133da8947562"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -95453,8 +97036,9 @@ self: { base directory filepath haskeline transformers ]; testHaskellDepends = [ - base containers directory filepath haskeline process time - transformers + base bytestring containers directory filepath haskeline + optparse-applicative process tagged tasty tasty-golden tasty-rerun + time transformers ]; doCheck = false; homepage = "http://www.idris-lang.org/"; @@ -96471,6 +98055,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "inchworm" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "inchworm"; + version = "1.0.0.1"; + sha256 = "40449b0515ab4ae191879cb951947ab5f44aed5d9c067beee5fb825f07318645"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/DDCSF/inchworm"; + description = "Inchworm Lexer Framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "include-file" = callPackage ({ mkDerivation, base, bytestring, random, template-haskell }: mkDerivation { @@ -97221,6 +98817,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "insert-ordered-containers_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, base-compat, hashable, lens + , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "insert-ordered-containers"; + version = "0.2.0.0"; + sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e"; + libraryHaskellDepends = [ + aeson base base-compat hashable lens semigroupoids semigroups text + transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat hashable lens QuickCheck semigroupoids + semigroups tasty tasty-quickcheck text transformers + unordered-containers + ]; + jailbreak = true; + homepage = "https://github.com/phadej/insert-ordered-containers#readme"; + description = "Associative containers retating insertion order for traversals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inserts" = callPackage ({ mkDerivation, attoparsec, base, bytestring, dlist }: mkDerivation { @@ -97591,6 +99212,8 @@ self: { pname = "intero"; version = "0.1.16"; sha256 = "28dc0a16cec34ec8423f7b97c5243f0a894d22881e400c8c74cb06608040dfa1"; + revision = "1"; + editedCabalFile = "ac2cf03606a57c99b8b685b5411a6e19aa59047203ecfb469c28397b52a69da1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -97838,8 +99461,8 @@ self: { }: mkDerivation { pname = "invertible"; - version = "0.1.1"; - sha256 = "c15730feb9dee7a930cf25d2f44e3e13e1c48e831202f7fa844a33e14e4f4acd"; + version = "0.1.2"; + sha256 = "3ee47b2ba98ff687c4988a1b065be8791523f169a57c006c719c58bd368bd344"; libraryHaskellDepends = [ arrows base haskell-src-meta HList invariant lens partial-isomorphisms Piso semigroupoids template-haskell @@ -98008,6 +99631,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-streams-haproxy" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, HUnit, io-streams + , network, test-framework, test-framework-hunit, transformers + }: + mkDerivation { + pname = "io-streams-haproxy"; + version = "1.0.0.1"; + sha256 = "c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f"; + libraryHaskellDepends = [ + attoparsec base bytestring io-streams network transformers + ]; + testHaskellDepends = [ + attoparsec base bytestring HUnit io-streams network test-framework + test-framework-hunit transformers + ]; + homepage = "http://snapframework.com/"; + description = "HAProxy protocol 1.5 support for io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "io-streams-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , io-streams, mtl, transformers @@ -98423,33 +100066,20 @@ self: { }) {}; "irc-core" = callPackage - ({ mkDerivation, array, attoparsec, base, base64-bytestring - , bytestring, config-value, connection, containers - , data-default-class, deepseq, directory, filepath, free - , haskell-lexer, lens, network, regex-tdfa, split, stm, text, time - , tls, transformers, vty, x509, x509-store, x509-system - , x509-validation + ({ mkDerivation, attoparsec, base, bytestring, hashable, lens + , memory, primitive, text, time, vector }: mkDerivation { pname = "irc-core"; - version = "1.1.5"; - sha256 = "59ce88cb12164583fbd7c889f13c3524a9cdc74a59ef5cbb7a704d67b0508bd2"; - isLibrary = true; - isExecutable = true; + version = "2.1.0.0"; + sha256 = "e1dcd6a967bd866d56df30b29fcdeb97b11d9608419e1886288e45a29a2e799d"; libraryHaskellDepends = [ - array attoparsec base base64-bytestring bytestring containers free - lens regex-tdfa text time transformers - ]; - executableHaskellDepends = [ - array base bytestring config-value connection containers - data-default-class deepseq directory filepath haskell-lexer lens - network regex-tdfa split stm text time tls transformers vty x509 - x509-store x509-system x509-validation + attoparsec base bytestring hashable lens memory primitive text time + vector ]; - jailbreak = true; homepage = "https://github.com/glguy/irc-core"; - description = "An IRC client library and text client"; - license = stdenv.lib.licenses.bsd3; + description = "IRC core library for glirc"; + license = stdenv.lib.licenses.isc; }) {}; "irc-ctcp" = callPackage @@ -100239,15 +101869,15 @@ self: { }: mkDerivation { pname = "json-api"; - version = "0.1.0.4"; - sha256 = "b846d72168ec304c2b8fdc726c4b46a3439609a045d17c6ac9b64b58ca59107b"; + version = "0.1.1.1"; + sha256 = "d5af631049fe2096c29f79b956f3c3b419b11f097278f131beee31a5369e2516"; libraryHaskellDepends = [ aeson base containers data-default lens-aeson text unordered-containers url ]; testHaskellDepends = [ aeson aeson-pretty base bytestring containers data-default hspec - lens lens-aeson text url + lens lens-aeson text unordered-containers url ]; jailbreak = true; homepage = "https://github.com/toddmohney/json-api"; @@ -100679,8 +102309,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.2.4.0"; - sha256 = "2a3a993a2d99f503fed13fad0193d005b2c75d768abdb64a254a687bb65e3ed1"; + version = "0.2.5.0"; + sha256 = "049c5248847b0b4da9b1cf34c36dbbf9f69fb4190228820cebf642f58204f850"; libraryHaskellDepends = [ aeson base bytestring deepseq mtl text unordered-containers vector ]; @@ -100703,8 +102333,8 @@ self: { pname = "json-schema"; version = "0.7.4.1"; sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96"; - revision = "3"; - editedCabalFile = "a919f70860dd9f379002ed0db301bbee85803dbf2661ae4c0d1f3045987f5233"; + revision = "4"; + editedCabalFile = "686610295b3967be97f3b6e433b76b331c203f9058cc05b6bcd907ddecdb8d00"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -101090,6 +102720,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jupyter" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, cereal, containers + , directory, exceptions, extra, filepath, monad-control, mtl + , process, SHA, silently, tasty, tasty-hunit, temporary, text + , transformers, unordered-containers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "jupyter"; + version = "0.9.0"; + sha256 = "93a049ba794d61c5cdef5523610bbdddcdc4527576bbaf997051da020074064c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base bytestring cereal containers directory exceptions + filepath monad-control mtl process SHA temporary text transformers + unordered-containers uuid zeromq4-haskell + ]; + executableHaskellDepends = [ base process text transformers ]; + testHaskellDepends = [ + aeson async base bytestring containers directory exceptions extra + process silently tasty tasty-hunit text transformers + unordered-containers zeromq4-haskell + ]; + homepage = "http://github.com/gibiansky/haskell-jupyter"; + description = "A library for creating and using Jupyter kernels"; + license = stdenv.lib.licenses.mit; + }) {}; + "jvm-parser" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , data-binary-ieee754, fgl, fingertree, pretty, zlib @@ -101176,6 +102834,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "kaleidoscope" = callPackage + ({ mkDerivation, base, containers, haskeline, llvm-general + , llvm-general-pure, mtl, parsec, transformers + }: + mkDerivation { + pname = "kaleidoscope"; + version = "0.1.0.0"; + sha256 = "01deac5b0a468c9be7dc9b13c01a152dbc185fe64b51c4f0947fad619fd751f5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base haskeline llvm-general llvm-general-pure mtl transformers + ]; + executableHaskellDepends = [ + base containers haskeline llvm-general llvm-general-pure mtl parsec + transformers + ]; + doHaddock = false; + jailbreak = true; + homepage = "https://github.com/sdiehl/kaleidoscope"; + description = "Haskell Kaleidoscope tutorial"; + license = stdenv.lib.licenses.mit; + }) {}; + "kan-extensions_4_2_3" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, mtl, semigroupoids, tagged @@ -101251,8 +102933,8 @@ self: { pname = "kansas-comet"; version = "0.4"; sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1"; - revision = "7"; - editedCabalFile = "beaef45f7b61a2883a64471f052ae8b9c51f8453c253e4328eddaf5ffe994d74"; + revision = "8"; + editedCabalFile = "d35522fe047447685a0028216de02d88ddd4706fe025bb1266ffda61df31a988"; libraryHaskellDepends = [ aeson base containers data-default-class scotty stm text time transformers unordered-containers @@ -101987,7 +103669,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "keter" = callPackage + "keter_1_4_3_1" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit , conduit-extra, containers, data-default, directory, filepath @@ -102001,8 +103683,8 @@ self: { pname = "keter"; version = "1.4.3.1"; sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f"; - revision = "1"; - editedCabalFile = "197ee783d18b293bb5fbe286623ca588695ec2115a012c3547535702fafc571f"; + revision = "2"; + editedCabalFile = "aebe235523c4b1c4a4c3bf091ba46349881fcc3ca5d69d3304dc395542b82adb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102018,6 +103700,42 @@ self: { testHaskellDepends = [ base bytestring conduit hspec HUnit transformers unix ]; + jailbreak = true; + homepage = "http://www.yesodweb.com/"; + description = "Web application deployment manager, focusing on Haskell web frameworks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "keter" = callPackage + ({ mkDerivation, aeson, array, async, attoparsec, base + , blaze-builder, bytestring, case-insensitive, conduit + , conduit-extra, containers, data-default, directory, filepath + , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy + , http-types, HUnit, lifted-base, mtl, network, process, random + , regex-tdfa, stm, tar, template-haskell, text, time, tls + , transformers, unix, unix-compat, unordered-containers, vector + , wai, wai-app-static, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "keter"; + version = "1.4.3.2"; + sha256 = "332c962cb73a5cf8213fb137b67e1ac8902a91489a5769ed990abf79a5374a8f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array async attoparsec base blaze-builder bytestring + case-insensitive conduit conduit-extra containers data-default + directory filepath fsnotify http-client http-conduit + http-reverse-proxy http-types lifted-base mtl network process + random regex-tdfa stm tar template-haskell text time tls + transformers unix unix-compat unordered-containers vector wai + wai-app-static wai-extra warp warp-tls yaml zlib + ]; + executableHaskellDepends = [ base data-default filepath ]; + testHaskellDepends = [ + base bytestring conduit hspec HUnit transformers unix + ]; homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; @@ -102044,7 +103762,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keycode" = callPackage + "keycode_0_2" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "keycode"; @@ -102056,6 +103774,21 @@ self: { homepage = "https://github.com/RyanGlScott/keycode"; description = "Maps web browser keycodes to their corresponding keyboard keys"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "keycode" = callPackage + ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + mkDerivation { + pname = "keycode"; + version = "0.2.2"; + sha256 = "56f9407cf182b01e5f0fda80f569ff629f37d894f75ef28b6b8af3024343d310"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + homepage = "https://github.com/RyanGlScott/keycode"; + description = "Maps web browser keycodes to their corresponding keyboard keys"; + license = stdenv.lib.licenses.bsd3; }) {}; "keyed" = callPackage @@ -102475,6 +104208,8 @@ self: { pname = "koofr-client"; version = "1.0.0.3"; sha256 = "2ab6f0af8be4f1912ad06ad860db993f9c33c8f0206f87ff0b566b7dda54e7af"; + revision = "1"; + editedCabalFile = "1bee9d4fc76133cecb131ba5ddc21278a871761d5e2225d4077f249b1ebb5161"; libraryHaskellDepends = [ aeson base bytestring filepath http-client http-client-tls http-types mtl @@ -102657,6 +104392,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "labels" = callPackage + ({ mkDerivation, base, bytestring, cassava, template-haskell + , unordered-containers + }: + mkDerivation { + pname = "labels"; + version = "0.1.0"; + sha256 = "cdd74a8e902b00fa74ee20bf895f39616b3325ba72197dd87e80299947bec8ca"; + libraryHaskellDepends = [ + base bytestring cassava template-haskell unordered-containers + ]; + homepage = "https://github.com/chrisdone/labels#readme"; + description = "Declare and access tuple fields with labels"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "laborantin-hs" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cmdlib, containers , directory, hslogger, mtl, old-locale, parsec, random, split, text @@ -102988,7 +104739,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {}; "lambdabot-core" = callPackage @@ -103015,7 +104766,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -103042,7 +104792,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -103061,7 +104810,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-misc-plugins" = callPackage @@ -103085,7 +104833,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-novelty-plugins" = callPackage @@ -103104,7 +104851,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Novelty plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-reference-plugins" = callPackage @@ -103123,7 +104869,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-social-plugins" = callPackage @@ -103140,7 +104885,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Social plugins for Lambdabot"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-trusted" = callPackage @@ -103175,7 +104919,6 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; - hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "lambdacat" = callPackage @@ -103674,6 +105417,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-conf" = callPackage + ({ mkDerivation, aeson, base, deepseq, directory, filepath, hspec + , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific + , semigroups, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "language-conf"; + version = "0.2.1.0"; + sha256 = "a61265983569cefca12d5c27fbaed131a0592ca4065fd375dcb224c36acfe024"; + libraryHaskellDepends = [ + aeson base deepseq directory filepath megaparsec pretty scientific + semigroups text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base directory filepath hspec hspec-megaparsec megaparsec + pretty QuickCheck semigroups text transformers + ]; + homepage = "https://github.com/beijaflor-io/haskell-language-conf#readme"; + description = "Conf parsers and pretty-printers for the Haskell programming language"; + license = stdenv.lib.licenses.mit; + }) {}; + "language-css" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { @@ -103698,6 +105463,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-dockerfile" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, free, Glob + , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + , ShellCheck, split, template-haskell, test-framework + , test-framework-hunit, th-lift, th-lift-instances, transformers + }: + mkDerivation { + pname = "language-dockerfile"; + version = "0.3.3.0"; + sha256 = "70850bdf6d00a40160a3203de2d94fd45e4b51edd2b8284952286a26adf49afc"; + libraryHaskellDepends = [ + base bytestring free mtl parsec pretty ShellCheck split + template-haskell th-lift th-lift-instances transformers + ]; + testHaskellDepends = [ + base bytestring directory filepath free Glob hspec HUnit mtl parsec + pretty process QuickCheck ShellCheck split template-haskell + test-framework test-framework-hunit th-lift th-lift-instances + transformers + ]; + doCheck = false; + homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; + description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "language-dockerfile_0_3_4_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, free, Glob + , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck + , ShellCheck, split, template-haskell, test-framework + , test-framework-hunit, th-lift, th-lift-instances, transformers + }: + mkDerivation { + pname = "language-dockerfile"; + version = "0.3.4.0"; + sha256 = "94e6996d5e56b6fb73f967e09d47d1aa2dc5a8e31ce991f27b49f28a3d8953d0"; + libraryHaskellDepends = [ + base bytestring free mtl parsec pretty ShellCheck split + template-haskell th-lift th-lift-instances transformers + ]; + testHaskellDepends = [ + base bytestring directory filepath free Glob hspec HUnit mtl parsec + pretty process QuickCheck ShellCheck split template-haskell + test-framework test-framework-hunit th-lift th-lift-instances + transformers + ]; + homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; + description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-dot" = callPackage ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { @@ -103856,6 +105673,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-hcl" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hspec + , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific + , semigroups, text, transformers, unordered-containers + }: + mkDerivation { + pname = "language-hcl"; + version = "0.1.2.0"; + sha256 = "e2219cfb72ed5b3f0d449513d4315c4f13e2a739fa6f9f15b810d8f1a91f4120"; + libraryHaskellDepends = [ + base deepseq directory filepath megaparsec pretty scientific + semigroups text unordered-containers + ]; + testHaskellDepends = [ + base directory filepath hspec hspec-megaparsec megaparsec pretty + QuickCheck semigroups text transformers + ]; + homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme"; + description = "HCL parsers and pretty-printers for the Haskell programming language"; + license = stdenv.lib.licenses.mit; + }) {}; + "language-java" = callPackage ({ mkDerivation, alex, array, base, cpphs, directory, filepath , HUnit, mtl, parsec, pretty, QuickCheck, test-framework @@ -104404,6 +106243,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "large-hashable" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytes, bytestring + , containers, hashable, HTF, QuickCheck, scientific, strict + , template-haskell, text, time, transformers, unordered-containers + , utf8-light, vector, void + }: + mkDerivation { + pname = "large-hashable"; + version = "0.1.0.1"; + sha256 = "c9ef2847d8f91fd72b45922c3f8ca58bd07fc2aa3b8248f02e34f44c801a7072"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytes bytestring containers scientific + strict template-haskell text time transformers unordered-containers + utf8-light vector void + ]; + testHaskellDepends = [ + aeson base bytes bytestring containers hashable HTF QuickCheck + scientific strict text time unordered-containers vector + ]; + homepage = "https://github.com/factisresearch/large-hashable"; + description = "Efficiently hash (large) Haskell values"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "largeword" = callPackage ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -104624,15 +106487,14 @@ self: { }: mkDerivation { pname = "layers-game"; - version = "0.5"; - sha256 = "688e13233f97989e999571a73163c5a15631da753db7715328b5a226077e4106"; + version = "0.5.2"; + sha256 = "fd6f64e4a61c9340c9d7d721b834879375e1c518161097b08f4a7b2e891169cc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs composition data-lens Gamgine GLFW-b ListZipper mtl OpenGLRaw pretty-show ]; - jailbreak = true; description = "A prototypical 2d platform game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -105251,8 +107113,8 @@ self: { pname = "lens-aeson"; version = "1.0.0.5"; sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f"; - revision = "2"; - editedCabalFile = "fb2b4c4dc5b44f95da81837394ea09416dd0211dd98e23c30c2473e2b39e844c"; + revision = "3"; + editedCabalFile = "d511d27175ba60166923027642b159100332d57db118fb7055cf512fbd0bd7d1"; libraryHaskellDepends = [ aeson attoparsec base bytestring lens scientific text unordered-containers vector @@ -106082,8 +107944,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.4"; - sha256 = "bdaa57a410396b2f02ddb9896823ce0a176751fa84261f445e9a5b7671333a7a"; + version = "0.9.0.6"; + sha256 = "bdebb946bba078ed85de12d71ef2e7efa7f28c1ed806d9a390a20d5e4590c937"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -106092,14 +107954,13 @@ self: { attoparsec base bytestring containers data-default-class filepath hspec mtl network old-locale QuickCheck text time unix utf8-string ]; - jailbreak = true; homepage = "http://github.com/vimus/libmpd-haskell#readme"; description = "An MPD client library"; license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "libnotify" = callPackage + "libnotify_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { pname = "libnotify"; @@ -106109,6 +107970,19 @@ self: { librarySystemDepends = [ libnotify ]; description = "Bindings to libnotify library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libnotify;}; + + "libnotify" = callPackage + ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: + mkDerivation { + pname = "libnotify"; + version = "0.2"; + sha256 = "665603c8343e5c7773b4fba87edd146d2f4565e75087609d1874fc4523955f59"; + libraryHaskellDepends = [ base bytestring glib gtk ]; + librarySystemDepends = [ libnotify ]; + description = "Bindings to libnotify library"; + license = stdenv.lib.licenses.mit; }) {inherit (pkgs) libnotify;}; "libnvvm" = callPackage @@ -106446,6 +108320,39 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {xslt = null;}; + "libzfs" = callPackage + ({ mkDerivation, base, mtl, nvpair, transformers, zfs }: + mkDerivation { + pname = "libzfs"; + version = "0.1.0.2"; + sha256 = "887ea6f0fbcba72885090666e3384b35cd543c7bc56f28fd1b9c6b5f6640f2e7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl transformers ]; + librarySystemDepends = [ nvpair zfs ]; + executableHaskellDepends = [ base mtl transformers ]; + executableSystemDepends = [ nvpair zfs ]; + description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; + license = stdenv.lib.licenses.mit; + }) {nvpair = null; inherit (pkgs) zfs;}; + + "licensor" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, HTTP, process + }: + mkDerivation { + pname = "licensor"; + version = "0.1.0"; + sha256 = "3fd79e5758020abbb0b9c583c5ec9f3e324ad4edd471f320478469600e4ef099"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal containers directory HTTP process + ]; + homepage = "https://github.com/jpvillaisaza/licensor"; + description = "A license compatibility helper"; + license = stdenv.lib.licenses.mit; + }) {}; + "life" = callPackage ({ mkDerivation, array, base, GLUT, OpenGL, random }: mkDerivation { @@ -107355,6 +109262,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "liquid" = callPackage + ({ mkDerivation, aeson, attoparsec, base, lens, lens-aeson, mtl + , QuickCheck, scientific, semigroups, tasty, tasty-hunit + , tasty-quickcheck, tasty-th, text, unordered-containers + , validation, vector + }: + mkDerivation { + pname = "liquid"; + version = "0.1.0.1"; + sha256 = "f2c7cbfb26acbc9abd1856286997c7175ea20c4584225c287d4c75938898f18d"; + libraryHaskellDepends = [ + aeson attoparsec base lens lens-aeson mtl scientific semigroups + text unordered-containers validation vector + ]; + testHaskellDepends = [ + aeson attoparsec base lens lens-aeson mtl QuickCheck scientific + semigroups tasty tasty-hunit tasty-quickcheck tasty-th text + unordered-containers validation vector + ]; + jailbreak = true; + homepage = "https://github.com/projectorhq/haskell-liquid"; + description = "Liquid template language library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, ascii-progress, async , attoparsec, base, bifunctors, binary, boxes, bytestring, cereal @@ -107565,7 +109497,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "list-t" = callPackage + "list-t_0_4_7" = callPackage ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control , mtl, mtl-prelude, transformers, transformers-base }: @@ -107582,6 +109514,25 @@ self: { homepage = "https://github.com/nikita-volkov/list-t"; description = "ListT done right"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "list-t" = callPackage + ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control + , mtl, mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1"; + sha256 = "519a68ce096452934a0d334e0081064139f08aaa0e1e2f81a627b16c28e88c15"; + libraryHaskellDepends = [ + base base-prelude mmorph monad-control mtl transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = stdenv.lib.licenses.mit; }) {}; "list-t-attoparsec" = callPackage @@ -108011,12 +109962,12 @@ self: { }) {}; "llvm-ffi" = callPackage - ({ mkDerivation, base, llvm }: + ({ mkDerivation, base, enumset, llvm }: mkDerivation { pname = "llvm-ffi"; - version = "3.5.0"; - sha256 = "ff292c630a7a9460ffad569afeb932d1471f15cbc54ceadf6b4ed5294c4aacef"; - libraryHaskellDepends = [ base ]; + version = "3.5.1"; + sha256 = "17f5ede28961ab5dddff7643a3c4bc82b5f68fc47f4671f758a85840c606d7a4"; + libraryHaskellDepends = [ base enumset ]; libraryPkgconfigDepends = [ llvm ]; homepage = "http://haskell.org/haskellwiki/LLVM"; description = "FFI bindings to the LLVM compiler toolkit"; @@ -108180,8 +110131,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.0.3.1.9"; - sha256 = "e35b74bdb1770647520e1dab28e692d0b3bfd83588010dc2fb426e3a5a897e44"; + version = "3.0.3.2"; + sha256 = "d2ddc2b15e48a241f43ff220d453839750c9c462f523b941c22fcff35ba3a02f"; libraryHaskellDepends = [ base containers fixed-length llvm-ffi non-empty process storable-record tfp transformers utility-ht @@ -108862,21 +110813,22 @@ self: { , containers, crypto-api, data-default, deepseq, DRBG , monadcryptorandom, MonadRandom, mtl, numeric-prelude , protocol-buffers, protocol-buffers-descriptor, QuickCheck, random - , reflection, repa, singletons, storable-record, tagged-transformer + , reflection, repa, singletons, tagged-transformer , template-haskell, test-framework, test-framework-quickcheck2 , th-desugar, transformers, vector, vector-th-unbox }: mkDerivation { pname = "lol"; - version = "0.4.0.0"; - sha256 = "1b8d9a3feb0140e5c36a3a09eb76430624df060741786047c5292dd0a604dce1"; + version = "0.5.0.2"; + sha256 = "7a3a494d8262865e7262bf34e39030f1bf48c81a602b8f81e1d50770372030ca"; + revision = "1"; + editedCabalFile = "3e58e5596d39e3a7265acecf79ece269b44cf58fd14699bdbc9a28fde0bd622d"; libraryHaskellDepends = [ arithmoi base binary bytestring constraints containers crypto-api data-default deepseq monadcryptorandom MonadRandom mtl numeric-prelude protocol-buffers protocol-buffers-descriptor - QuickCheck random reflection repa singletons storable-record - tagged-transformer template-haskell th-desugar transformers vector - vector-th-unbox + QuickCheck random reflection repa singletons tagged-transformer + template-haskell th-desugar transformers vector vector-th-unbox ]; testHaskellDepends = [ arithmoi base constraints deepseq DRBG MonadRandom mtl QuickCheck @@ -108899,6 +110851,8 @@ self: { pname = "lol-apps"; version = "0.1.1.0"; sha256 = "75b0d6d53161d25e77286ab0cbf43487112f6b6d944ff77d11ace6e7ef83af7e"; + revision = "2"; + editedCabalFile = "5d9f33a4442eff096507ba9917c86de5cd01ee1fe55f4837c69301ccaa7f4c69"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109204,6 +111158,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lrucaching" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , hspec, psqueues, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "lrucaching"; + version = "0.3.0"; + sha256 = "7e699143604a50f597ba4b7877fecd04e6c23bcb303fac4831056966bd521a7f"; + libraryHaskellDepends = [ + base base-compat deepseq hashable psqueues vector + ]; + testHaskellDepends = [ + base containers deepseq hashable hspec QuickCheck transformers + ]; + homepage = "https://github.com/cocreature/lrucaching#readme"; + description = "LRU cache"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ls-usb" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols , cmdtheline, text, usb, usb-id-database, vector @@ -110466,8 +112439,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }: mkDerivation { pname = "makefile"; - version = "0.1.0.3"; - sha256 = "2ad77fc1cc390225ecb7155f6df87b3be5bdba5803629ba687f98711a8114e4a"; + version = "0.1.0.5"; + sha256 = "e47e5f07b23071ea1a9881c034ce66f915d3c2a3cf646b4f7db2718725d80316"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; doCheck = false; @@ -110873,7 +112846,7 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; - "mandrill" = callPackage + "mandrill_0_5_2_2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck @@ -110895,6 +112868,31 @@ self: { ]; description = "Library for interfacing with the Mandrill JSON API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mandrill" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-html + , bytestring, containers, email-validate, http-client + , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck + , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time + , unordered-containers + }: + mkDerivation { + pname = "mandrill"; + version = "0.5.2.3"; + sha256 = "fe53d80b0c082119e58ff78a8b89084b182e7a82f685d6dfc57d6154b1420a27"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-html bytestring containers + email-validate http-client http-client-tls http-types lens mtl + old-locale QuickCheck text time unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Library for interfacing with the Mandrill JSON API"; + license = stdenv.lib.licenses.mit; }) {}; "mandulia" = callPackage @@ -111005,7 +113003,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "map-syntax" = callPackage + "map-syntax_0_2" = callPackage ({ mkDerivation, base, containers, deepseq, HUnit, mtl, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 , transformers @@ -111022,6 +113020,23 @@ self: { jailbreak = true; description = "Syntax sugar for defining maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "map-syntax" = callPackage + ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl + , QuickCheck, transformers + }: + mkDerivation { + pname = "map-syntax"; + version = "0.2.0.1"; + sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55"; + libraryHaskellDepends = [ base containers mtl ]; + testHaskellDepends = [ + base containers deepseq hspec HUnit mtl QuickCheck transformers + ]; + description = "Syntax sugar for defining maps"; + license = stdenv.lib.licenses.bsd3; }) {}; "mappy" = callPackage @@ -111326,6 +113341,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mars" = callPackage + ({ mkDerivation, array, base, bytestring, colour, gloss + , MonadRandom, mtl, random + }: + mkDerivation { + pname = "mars"; + version = "0.1.0.0"; + sha256 = "3154d125ab96dcb6fc23685ca35483d622e8e6ff02e5564df570eb3cfed80ae9"; + libraryHaskellDepends = [ + array base bytestring colour gloss MonadRandom mtl random + ]; + jailbreak = true; + homepage = "https://qlfiles.net"; + description = "Generates mountainous terrain using a random walk algorithm"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "marxup" = callPackage ({ mkDerivation, base, configurator, containers, cubicbezier , directory, dlist, filepath, glpk-hs, graphviz, labeled-tree, lens @@ -111457,6 +113489,8 @@ self: { pname = "math-functions"; version = "0.2.0.1"; sha256 = "ac165116d981d879b4ea4f387d40140515d75823d8d60295514c41dbf4cac641"; + revision = "1"; + editedCabalFile = "3722814c83e907f40959812ff4209a704e27d53be667c98b83815b222e073f27"; libraryHaskellDepends = [ base deepseq primitive vector vector-th-unbox ]; @@ -111980,6 +114014,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mecab;}; + "mech" = callPackage + ({ mkDerivation, base, machines }: + mkDerivation { + pname = "mech"; + version = "0.0.0.0"; + sha256 = "dad2e243e0122a9c0cde529c0a309775b9332b20301942d1b02ded6c32013665"; + libraryHaskellDepends = [ base machines ]; + jailbreak = true; + homepage = "http://github.com/cartazio/mecha"; + description = "mecha are the most complex composite machines known to humanity, lets build them well!"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "mecha" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -111994,6 +114041,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mechs" = callPackage + ({ mkDerivation, base, machines }: + mkDerivation { + pname = "mechs"; + version = "0.0.0.0"; + sha256 = "dd73407f98ef5c1a795df33cb4537df60a62f36d34c7cf9a0dd0685aa5c6e413"; + libraryHaskellDepends = [ base machines ]; + jailbreak = true; + homepage = "http://github.com/cartazio/mecha"; + description = "mecha are the most complex composite machines known to humanity, lets build them well!"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "mediawiki" = callPackage ({ mkDerivation, base, HTTP, mime, network, pretty, utf8-string , xml @@ -112830,16 +114890,15 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.4.6.0"; - sha256 = "6b3dcc4921568c89bacb0b2c827b91065db3711eb78b7ec91fc8c9a02d78812b"; + version = "0.4.7.0"; + sha256 = "c149874a5cf038c1dde51b79b22733116817619e5ed11c7787aadb9d8ea31e26"; libraryHaskellDepends = [ base ]; - doHaddock = false; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-aeson" = callPackage + "microlens-aeson_2_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, directory , doctest, filepath, generic-deriving, microlens, scientific , semigroups, simple-reflect, text, unordered-containers, vector @@ -112859,6 +114918,29 @@ self: { homepage = "http://github.com/fosskers/microlens-aeson/"; description = "Law-abiding lenses for Aeson, using microlens"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-aeson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "microlens-aeson"; + version = "2.1.1.1"; + sha256 = "301011a83092af23039a953730551af799af30e81fec9c0c31885fc40cd0ca98"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring microlens scientific text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring microlens tasty tasty-hunit text + unordered-containers vector + ]; + homepage = "http://github.com/fosskers/microlens-aeson/"; + description = "Law-abiding lenses for Aeson, using microlens"; + license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -112911,8 +114993,8 @@ self: { }: mkDerivation { pname = "microlens-ghc"; - version = "0.4.6.0"; - sha256 = "e1fbcd4b6506658dccb2df5ea548d46fa76434f80af368701ae93df84e01fec1"; + version = "0.4.7.0"; + sha256 = "ef1f68645d0f62e9f108852dd0637109625703175eb571c7f183aa3244bf0cdf"; libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; @@ -112979,8 +115061,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.5.0"; - sha256 = "7c51fe542759951daf7eb79c5e5644c214da89a0057797845da3971423cdc9aa"; + version = "0.3.7.0"; + sha256 = "8050a15818c3ee2e58b42f948aef7d658cb7d06f5007a3e58560faef39a6bf09"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -112990,7 +115072,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th" = callPackage + "microlens-th_0_4_0_0" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { pname = "microlens-th"; @@ -113002,6 +115084,21 @@ self: { homepage = "http://github.com/aelve/microlens"; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens-th" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.1.0"; + sha256 = "c62afe3fbac955771f4b000181e0c237ab61105a26a76e45c4958b37b7155baa"; + libraryHaskellDepends = [ + base containers microlens template-haskell + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; }) {}; "micrologger" = callPackage @@ -113010,8 +115107,8 @@ self: { }: mkDerivation { pname = "micrologger"; - version = "0.3.0.0"; - sha256 = "9c23cb35299beab63e47255f04de67d436ce12ea0f793386a4d588a9d0b5a0e1"; + version = "0.3.1.0"; + sha256 = "d0371c5056b7f68bb2b1f1157c162b2d084fa8d6e316b005b1e75200edbd9d96"; libraryHaskellDepends = [ aeson base containers text text-format time transformers ]; @@ -113154,6 +115251,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "midi-utils" = callPackage + ({ mkDerivation, base, bytestring, directory, event-list, midi + , parsec, process + }: + mkDerivation { + pname = "midi-utils"; + version = "0.1.0.0"; + sha256 = "3fa2fb1f7d462ad26b8fe02bca69f7054fb41555d601798adc41872e3d8c9db6"; + libraryHaskellDepends = [ + base bytestring directory event-list midi parsec process + ]; + jailbreak = true; + homepage = "https://github.com/GuiltyDolphin/midi-utils"; + description = "Utilities for working with MIDI data"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "midimory" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, containers, random , transformers, wx, wxcore @@ -115513,8 +117627,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.1.0.2"; - sha256 = "476489da2b14e55c7c3a17bce0e3eb6283eb72a0f4dfa823ba7708a13924ce2c"; + version = "2.1.1"; + sha256 = "b8f737847418fa1c9f4f9746762c47f3eaa7ce45acdcb5efc2e4c2bcd22e922e"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring containers cryptohash data-default-class hashtables @@ -115591,8 +117705,8 @@ self: { }: mkDerivation { pname = "monky"; - version = "2.0.0.0"; - sha256 = "922edbc9f8926fdcba6f1a141c010a4aff00fc7cb9df7094a9150412fc53d850"; + version = "2.0.1.0"; + sha256 = "8cd4fd086f4c3719af8c57d668ac0c7eb89a946a306b87485c267225546ec288"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116587,6 +118701,17 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "mtl-extras" = callPackage + ({ mkDerivation, base, mtl, transformers }: + mkDerivation { + pname = "mtl-extras"; + version = "0.1"; + sha256 = "ff9264943dfded23102c964cb327fea080a19191bc536d9a9a898dab9fa9fcec"; + libraryHaskellDepends = [ base mtl transformers ]; + description = "Higher order versions of MTL classes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mtl-prelude_1_0_3" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -116751,10 +118876,8 @@ self: { }: mkDerivation { pname = "mueval"; - version = "0.9.1.1.2"; - sha256 = "e04c3b754695cc8f71c072c6398b8a567c112c69d48355b5bca9bfbb1c050ac1"; - revision = "2"; - editedCabalFile = "fbea4bfb334f9f8ff79942e916e22c1ee9c1a78126f59d7a64e64bc6aa592151"; + version = "0.9.3"; + sha256 = "f72a8bbaffecaeb55b67d78011e182073be8ba9f4a90824903e4c78cfe6e1ef7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116762,7 +118885,6 @@ self: { mtl process QuickCheck show simple-reflect unix ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/gwern/mueval"; description = "Safely evaluate pure Haskell expressions"; license = stdenv.lib.licenses.bsd3; @@ -117515,7 +119637,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mustache" = callPackage + "mustache_1_0_2" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, mtl , parsec, process, scientific, temporary, text @@ -117546,6 +119668,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mustache" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.0.1"; + sha256 = "18404b812c7205eafe70f2cfbdf02828947405e4ff0dad86d790be68b956c834"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + homepage = "https://github.com/JustusAdam/mustache"; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -117876,6 +120029,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell" = callPackage + ({ mkDerivation, base, binary, blaze-textual, bytestring + , bytestring-lexing, cryptonite, io-streams, memory, monad-loops + , network, scientific, tasty, tasty-hunit, tcp-streams, text, time + , tls, transformers, wire-streams, word24 + }: + mkDerivation { + pname = "mysql-haskell"; + version = "0.1.0.0"; + sha256 = "3367dd2735ee81268d6c02da7a9588374258f8ec9eb860f71d74ead2ccd2b735"; + libraryHaskellDepends = [ + base binary blaze-textual bytestring bytestring-lexing cryptonite + io-streams memory monad-loops network scientific tcp-streams text + time tls transformers wire-streams word24 + ]; + testHaskellDepends = [ + base bytestring io-streams tasty tasty-hunit text time + ]; + jailbreak = true; + homepage = "https://github.com/winterland1989/mysql-haskell"; + description = "pure haskell MySQL driver"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, mysql, old-locale, pcre-light, text @@ -118307,8 +120484,8 @@ self: { }: mkDerivation { pname = "nanovg"; - version = "0.4.0.0"; - sha256 = "910addcdcf0691facf8a599fb800f0bdaf93cd06ba3bf76bdf3e6d0080833e91"; + version = "0.5.0.0"; + sha256 = "26fae2bd7cc430b5fa46200ae0100779f481cde5c236d33f87a78feca3678f6e"; libraryHaskellDepends = [ base bytestring containers text vector ]; librarySystemDepends = [ freeglut GLEW mesa ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; @@ -119657,16 +121834,16 @@ self: { }) {}; "network-ip" = callPackage - ({ mkDerivation, base, binary, cereal, data-default-class - , data-dword, data-endian, data-textual, hashable, parsers, tasty + ({ mkDerivation, base, data-default-class, data-dword, data-endian + , data-serializer, data-textual, hashable, parsers, tasty , tasty-quickcheck, text-printer, type-hint }: mkDerivation { pname = "network-ip"; - version = "0.2.1.1"; - sha256 = "3e8294bc1ecb2a4cbe78de237f6adf60332303a6f693091bd5b9a511ef016c29"; + version = "0.3"; + sha256 = "e2201085a7df57356ba6fe30f8a200dce71226b96166af08ed29dbce728f8f53"; libraryHaskellDepends = [ - base binary cereal data-default-class data-dword data-endian + base data-default-class data-dword data-endian data-serializer data-textual hashable parsers text-printer type-hint ]; testHaskellDepends = [ @@ -120182,6 +122359,7 @@ self: { array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text ]; testHaskellDepends = [ base doctest Glob hspec MonadRandom ]; + jailbreak = true; homepage = "https://github.com/brunjlar/neural"; description = "Neural Networks in native Haskell"; license = stdenv.lib.licenses.mit; @@ -120918,6 +123096,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "normalization-insensitive" = callPackage + ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit + , test-framework, test-framework-hunit, text, unicode-transforms + }: + mkDerivation { + pname = "normalization-insensitive"; + version = "2.0"; + sha256 = "8f8ab5ae70a07a2d65fd0a46dbd8ed5cc3f3af5e95aa074e5a12b312a4dd4e29"; + libraryHaskellDepends = [ + base bytestring deepseq hashable text unicode-transforms + ]; + testHaskellDepends = [ + base bytestring hashable HUnit test-framework test-framework-hunit + text + ]; + homepage = "https://github.com/ppelleti/normalization-insensitive"; + description = "Normalization insensitive string comparison"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "not-gloss" = callPackage ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL , OpenGLRaw, spatial-math, time, vector, vector-binary-instances @@ -121811,8 +124009,8 @@ self: { }: mkDerivation { pname = "octane"; - version = "0.13.3"; - sha256 = "c3755604afc8b1757bdc94383d04d757ae6cd525f41b55ba9a210e1d74f6a9fb"; + version = "0.13.4"; + sha256 = "ac1e3afab893ae0cf5c134640b6b825a833a6fc6226e8f607be1ff53203a2005"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123477,6 +125675,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-applicative_0_13_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck + , transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.13.0.0"; + sha256 = "cec6b1d94d347898a25446fb8a6643399d8429cf326f221e38a02d849b2b0cac"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-declarative" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -123987,10 +126203,10 @@ self: { }: mkDerivation { pname = "overloaded-records"; - version = "0.4.1.0"; - sha256 = "f97b08e420bfc9d435a77ec391fec1da305000faaaf0c01ad84217de003b5a76"; + version = "0.4.2.0"; + sha256 = "86b1b43fac513cada6d1e48ca61fe7ae451884f2baa5915b569cf6b72ae83296"; revision = "1"; - editedCabalFile = "0aa55c702c1bbd15c4ddeb7efd21c2024e628ea266ae601673c2cf9bb5e25f24"; + editedCabalFile = "d9facb383b2a9eaff023753b26737b7c5fb0b35af0f0dd3aa1ccb9e9b02c7605"; libraryHaskellDepends = [ base data-default-class template-haskell ]; @@ -123998,7 +126214,6 @@ self: { base data-default-class HUnit template-haskell test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/trskop/overloaded-records"; description = "Overloaded Records based on current GHC proposal"; license = stdenv.lib.licenses.bsd3; @@ -124330,7 +126545,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "palette" = callPackage + "palette_0_1_0_3" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { pname = "palette"; @@ -124340,6 +126555,19 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Utilities for choosing and creating color schemes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "palette" = callPackage + ({ mkDerivation, array, base, colour, containers }: + mkDerivation { + pname = "palette"; + version = "0.1.0.4"; + sha256 = "e6b3b4a0077d651ac7cb90c113ce7d6bd228aab57c9fe26e475abe6fcaada7cc"; + libraryHaskellDepends = [ array base colour containers ]; + homepage = "http://projects.haskell.org/diagrams"; + description = "Utilities for choosing and creating color schemes"; + license = stdenv.lib.licenses.bsd3; }) {}; "palindromes" = callPackage @@ -126819,29 +129047,67 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_6" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, conduit, containers + , exceptions, fast-logger, hspec, http-api-data, lifted-base + , monad-control, monad-logger, mtl, old-locale, path-pieces + , resource-pool, resourcet, scientific, silently, tagged + , template-haskell, text, time, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.6"; + sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html blaze-markup + bytestring conduit containers exceptions fast-logger http-api-data + lifted-base monad-control monad-logger mtl old-locale path-pieces + resource-pool resourcet scientific silently tagged template-haskell + text time transformers transformers-base unordered-containers + vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data lifted-base + monad-control monad-logger mtl old-locale path-pieces resource-pool + resourcet scientific tagged template-haskell text time transformers + unordered-containers vector + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, getopt-generics - , hspec, mongoDB, persistent, persistent-mongoDB, persistent-sqlite - , persistent-template, text, time, transformers + ({ mkDerivation, aeson, attoparsec, base, bytestring + , getopt-generics, hashable, hspec, mongoDB, persistent + , persistent-mongoDB, persistent-sqlite, persistent-template, text + , time, transformers, unordered-containers }: mkDerivation { pname = "persistent-audit"; - version = "0.1.0.1"; - sha256 = "d610b0614e3005958e5dcaf59fd9e847d36606cbf5dd1af0b43708e39729f956"; + version = "0.1.0.3"; + sha256 = "6ce619eaa1e4693aa447cec1c5c9ecc328eca2b0e9631ffcbea3144398d054ce"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring mongoDB persistent persistent-mongoDB - persistent-template text time transformers + aeson attoparsec base bytestring hashable mongoDB persistent + persistent-mongoDB persistent-template text time transformers + unordered-containers ]; executableHaskellDepends = [ - attoparsec base bytestring getopt-generics mongoDB persistent - persistent-mongoDB persistent-template text time + aeson attoparsec base bytestring getopt-generics hashable mongoDB + persistent persistent-mongoDB persistent-template text time + unordered-containers ]; testHaskellDepends = [ - attoparsec base bytestring hspec mongoDB persistent + aeson attoparsec base bytestring hashable hspec mongoDB persistent persistent-mongoDB persistent-sqlite persistent-template text time - transformers + transformers unordered-containers ]; description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; @@ -126987,8 +129253,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.5"; - sha256 = "e181caeafa76905faa57ba5173ce5171469753b20d276bd008a515eb7e696e84"; + version = "2.5.0.1"; + sha256 = "0fa7b288a063d0e3dd187a41992d14ac9af9eb57a494923074d3a4db3b04b91e"; libraryHaskellDepends = [ aeson attoparsec base bson bytestring cereal conduit containers http-api-data monad-control mongoDB network path-pieces persistent @@ -127028,13 +129294,14 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.5"; - sha256 = "fad1617beb44caa9e39c7aab574296004c45f5554bf76b404697e48c61e7395d"; + version = "2.6"; + sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers ]; + jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; @@ -127105,6 +129372,29 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_6" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, persistent + , postgresql-libpq, postgresql-simple, resource-pool, resourcet + , text, time, transformers + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.6"; + sha256 = "d640eecc5c8528c5ab42f08a01b74d409ca2b8e67259f477f3cd3686bc3aaae2"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resource-pool resourcet text time transformers + ]; + jailbreak = true; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -127226,6 +129516,33 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-sqlite_2_6" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , hspec, monad-control, monad-logger, old-locale, persistent + , persistent-template, resource-pool, resourcet, temporary, text + , time, transformers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.6"; + sha256 = "628670f06cc533adb057649a253e9332aa2b3f69278af8fd32905e9bb00e0ffa"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers monad-control monad-logger + old-locale persistent resource-pool resourcet text time + transformers + ]; + testHaskellDepends = [ + base hspec persistent persistent-template temporary text time + transformers + ]; + jailbreak = true; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-template_2_1_8_1" = callPackage ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers , ghc-prim, hspec, http-api-data, monad-control, monad-logger @@ -127259,8 +129576,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.5.1.4"; - sha256 = "bd2fb5aadbee3770c562a472e87dd812f30fea05334e6e19b223f322ebced072"; + version = "2.5.1.6"; + sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -127715,13 +130032,13 @@ self: { "phoityne-vscode" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, cmdargs, conduit , conduit-extra, ConfigFile, containers, directory, filepath - , fsnotify, hslogger, hspec, HStringTemplate, MissingH, mtl, parsec + , fsnotify, hslogger, HStringTemplate, MissingH, mtl, parsec , process, resourcet, safe, split, text, transformers }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.7.0"; - sha256 = "6b209e6f85bf062d2443531661f4da5253450635f77a6f4f177768d11272651d"; + version = "0.0.8.0"; + sha256 = "da086d093e31f1277d7a3f5876d57122f9f5517747399a3f001986e3f05854e8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127730,7 +130047,6 @@ self: { HStringTemplate MissingH mtl parsec process resourcet safe split text transformers ]; - testHaskellDepends = [ aeson base hspec ]; homepage = "https://sites.google.com/site/phoityne/vscode"; description = "ghci debug viewer on Visual Studio Code"; license = stdenv.lib.licenses.bsd3; @@ -128062,24 +130378,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pinboard_0_9_7" = callPackage + "pinboard_0_9_9" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either, hspec , http-client, http-client-tls, http-types, mtl, network - , profunctors, QuickCheck, random, semigroups, text, time - , transformers, unordered-containers, vector + , profunctors, QuickCheck, random, safe-exceptions, semigroups + , text, time, transformers, unordered-containers, vector }: mkDerivation { pname = "pinboard"; - version = "0.9.7"; - sha256 = "429f35da8a6c860ac2c20cfd87fe3dd01f53dbf7cfc44a24ba2f059e6d4fe681"; + version = "0.9.9"; + sha256 = "0000e935c683365d31d20b307b8e5495b311219f5aef66da6dcce65675fffa25"; libraryHaskellDepends = [ aeson base bytestring containers either http-client http-client-tls - http-types mtl network profunctors random text time transformers - unordered-containers vector + http-types mtl network profunctors random safe-exceptions text time + transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck semigroups - text time transformers unordered-containers + aeson base bytestring containers hspec mtl QuickCheck + safe-exceptions semigroups text time transformers + unordered-containers ]; jailbreak = true; homepage = "https://github.com/jonschoning/pinboard"; @@ -128134,7 +130451,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; - "pinchot" = callPackage + "pinchot_0_18_2_0" = callPackage ({ mkDerivation, base, containers, Earley, lens, ListLike , semigroups, template-haskell, transformers }: @@ -128149,6 +130466,25 @@ self: { homepage = "http://www.github.com/massysett/pinchot"; description = "Write grammars, not parsers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pinchot" = callPackage + ({ mkDerivation, base, containers, Earley, lens, ListLike + , non-empty-sequence, pretty-show, semigroups, template-haskell + , transformers + }: + mkDerivation { + pname = "pinchot"; + version = "0.20.0.0"; + sha256 = "704dcc99baf5cb62836696cdf66d785b7e9d103511a616734329844c1b0e669e"; + libraryHaskellDepends = [ + base containers Earley lens ListLike non-empty-sequence pretty-show + semigroups template-haskell transformers + ]; + homepage = "http://www.github.com/massysett/pinchot"; + description = "Write grammars, not parsers"; + license = stdenv.lib.licenses.bsd3; }) {}; "pipe-enumerator" = callPackage @@ -128390,8 +130726,8 @@ self: { ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: mkDerivation { pname = "pipes-cacophony"; - version = "0.3.0"; - sha256 = "1d489dccb63694e120cf53b4b313363f03f09863bd14243521328f7c5bec0e6a"; + version = "0.4.0"; + sha256 = "224ff8983cc61a92bc733cbdd2a9632b30858ef7a644203a346c0c9d18821ec0"; libraryHaskellDepends = [ base bytestring cacophony pipes ]; testHaskellDepends = [ base hlint ]; homepage = "https://github.com/centromere/pipes-cacophony"; @@ -129236,19 +131572,19 @@ self: { }) {}; "pixelated-avatar-generator" = callPackage - ({ mkDerivation, base, bytestring, hspec, JuicyPixels, pureMD5 - , QuickCheck, split + ({ mkDerivation, async, base, bytestring, cli, hspec, JuicyPixels + , pureMD5, QuickCheck, random, split }: mkDerivation { pname = "pixelated-avatar-generator"; - version = "0.1.2"; - sha256 = "d9676ec3b4af31ca6628305c3bd1620de248a240a581281f359655629c00aa75"; + version = "0.1.3"; + sha256 = "4d7d87404121f5481faa7d6af087575a9541aaad96b196ec230d1883a563a078"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring JuicyPixels pureMD5 split ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ async base cli random ]; testHaskellDepends = [ base bytestring hspec JuicyPixels QuickCheck ]; @@ -129884,6 +132220,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pointful_1_0_9" = callPackage + ({ mkDerivation, base, containers, haskell-src-exts-simple, mtl + , syb, transformers + }: + mkDerivation { + pname = "pointful"; + version = "1.0.9"; + sha256 = "6a1881236419751beb5b2e4e495bd9093ea2dec3f3cbd44e2a62aaabe53cacd6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers haskell-src-exts-simple mtl syb transformers + ]; + executableHaskellDepends = [ base ]; + jailbreak = true; + homepage = "http://github.com/23Skidoo/pointful"; + description = "Pointful refactoring tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pointless-fun" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -130006,9 +132363,9 @@ self: { ({ mkDerivation, base, containers, HUnit, MissingH, mtl, parsec }: mkDerivation { pname = "polar-configfile"; - version = "0.4.1.0"; - sha256 = "ae0d19890ee5e24a0d36eacacf22fad1eff68c471bcdd8b84fa727aedf7135d2"; - libraryHaskellDepends = [ base containers MissingH mtl parsec ]; + version = "0.5.0.0"; + sha256 = "385a2c0e2aa39865f161cfd8cf0b77a6b5d7b126c08ceaf33dc08ce817ffa9fb"; + libraryHaskellDepends = [ base containers mtl parsec ]; testHaskellDepends = [ base containers HUnit MissingH mtl parsec ]; description = "Fork of ConfigFile for Polar Game Engine"; license = stdenv.lib.licenses.bsd3; @@ -130745,7 +133102,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-binary" = callPackage + "postgresql-binary_0_9_0_1" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq @@ -130773,6 +133130,37 @@ self: { homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "postgresql-binary" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rebase, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time + , transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.9.1"; + sha256 = "3b3bc4ecdc145e18e88775fbc0989f5bc5c94e58b6603cccfc024c10a423a109"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring conversion conversion-bytestring + conversion-text either json-ast loch-th placeholders + postgresql-libpq QuickCheck quickcheck-instances rebase scientific + tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time + transformers uuid vector + ]; + jailbreak = true; + doCheck = false; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; }) {}; "postgresql-config" = callPackage @@ -131552,6 +133940,27 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "preliminaries" = callPackage + ({ mkDerivation, abstract-par, bifunctors, classy-prelude-conduit + , data-default, microlens-contra, microlens-platform, monad-par + , monad-parallel, mono-traversable-instances, mtl, parallel + , stm-conduit, string-conversions + }: + mkDerivation { + pname = "preliminaries"; + version = "0.1.4.0"; + sha256 = "50f7dc0e791e8c88674995729a46bf6d4b2d86bc88a0ce22d53968b18fb86e63"; + libraryHaskellDepends = [ + abstract-par bifunctors classy-prelude-conduit data-default + microlens-contra microlens-platform monad-par monad-parallel + mono-traversable-instances mtl parallel stm-conduit + string-conversions + ]; + homepage = "http://github.com/kerscher/preliminaries"; + description = "A larger alternative to the Prelude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prelude-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -131867,6 +134276,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-types" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "pretty-types"; + version = "0.1.1.0"; + sha256 = "10f351d6c028ddaf745a4d17a3c3191c7e8d917ad1503b2339e7bd432d7f03f8"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/sheyll/pretty-types#readme"; + description = "A small pretty printing DSL for complex types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "prettyFunctionComposing" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -132194,6 +134616,19 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "proc-net" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, network, unix }: + mkDerivation { + pname = "proc-net"; + version = "1.0.0.2"; + sha256 = "ff2fef989700770d1405abbd7d89d106b6cdae1c731e8b54107022a98521fd13"; + libraryHaskellDepends = [ + attoparsec base bytestring network unix + ]; + description = "Parse /proc/net/ tcp,tcp6,udp,udp6"; + license = stdenv.lib.licenses.mit; + }) {}; + "process_1_4_2_0" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, unix }: mkDerivation { @@ -133300,7 +135735,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "protolude" = callPackage + "protolude_0_1_6" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , ghc-prim, mtl, safe, stm, text, transformers }: @@ -133315,6 +135750,24 @@ self: { homepage = "https://github.com/sdiehl/protolude"; description = "A sensible set of defaults for writing custom Preludes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "protolude" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , ghc-prim, mtl, safe, stm, text, transformers + }: + mkDerivation { + pname = "protolude"; + version = "0.1.7"; + sha256 = "7b8386d3e6d15f477bbbe4e8901ae840509bb6d0d63c6e98f8ca7c13f2473b79"; + libraryHaskellDepends = [ + async base bytestring containers deepseq ghc-prim mtl safe stm text + transformers + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A sensible set of defaults for writing custom Preludes"; + license = stdenv.lib.licenses.mit; }) {}; "proton-haskell" = callPackage @@ -133437,6 +135890,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.5.0"; sha256 = "11db4cd25d452d126cc4761daeff4068a42070919939aec490f7a23fb8136876"; + revision = "1"; + editedCabalFile = "06425fb261d25e35ad80b858435efbc7fed38eb17c54793e6d57c77bf15ae250"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec @@ -133445,7 +135900,6 @@ self: { base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th temporary ]; - jailbreak = true; homepage = "https://github.com/msakai/pseudo-boolean"; description = "Reading/Writing OPB/WBO files used in pseudo boolean competition"; license = stdenv.lib.licenses.bsd3; @@ -134698,8 +137152,8 @@ self: { ({ mkDerivation, base, qtah-generator, qtbase }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.1.1"; - sha256 = "474d1add4e58ab817679d1d6d51508737c3f45d272836efbbf883bf600149cce"; + version = "0.1.2"; + sha256 = "1a99a2c0c5eb8cb60d162298600ee2bba993ce3224ac412cf9eeec386503e258"; libraryHaskellDepends = [ base qtah-generator ]; librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; @@ -134734,8 +137188,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.1.1"; - sha256 = "10cf7128d9cd923fa677433222720770762b1c72fcd74b26d3174e9d7a7c028f"; + version = "0.1.2"; + sha256 = "77ef82acf21be83855ad04c40dfe6aa66439eb6f42f58774687c9d4f5f94c56f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -134756,8 +137210,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.1.0"; - sha256 = "9dd81185388e8f769e38e02eda9ea5a8b9d8f1c26e3dd15825b08d72385962e7"; + version = "0.1.1"; + sha256 = "1b6cf51a5e9bb730e3465b6ed6a2bf044c1e7122f948c59234ec20651dbc7033"; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -135043,6 +137497,23 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "quickcheck-arbitrary-adt" = callPackage + ({ mkDerivation, base, hspec, lens, QuickCheck, template-haskell + , transformers + }: + mkDerivation { + pname = "quickcheck-arbitrary-adt"; + version = "0.1.0.0"; + sha256 = "d28cafb8aadeb8931076e3ba2565e9bcc1bbb51f57d54f301e3b524f83931e80"; + libraryHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base hspec lens QuickCheck template-haskell transformers + ]; + homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme"; + description = "Generic typeclasses for generating arbitrary ADTs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "quickcheck-assertions" = callPackage ({ mkDerivation, base, hspec, ieee754, QuickCheck }: mkDerivation { @@ -136365,6 +138836,8 @@ self: { pname = "rasterific-svg"; version = "0.3.1.2"; sha256 = "83c90ea97d73f05003de2a4622ed26754fa52cb94a3341feada477713332a789"; + revision = "1"; + editedCabalFile = "1a66db5d85478533f4d6702dd36b158f464f3a725a365bcb68fefed59edfa586"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136419,8 +138892,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.3.0"; - sha256 = "08e96d4ad35c562fd4bb651303ee527d0d2e83d45ea026060fec45e3aed6a3e7"; + version = "0.3.1"; + sha256 = "20178614b08e446c50717ba4988440ad342adc70dfa3ab51a1357057223f31fe"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -137052,7 +139525,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "read-env-var" = callPackage + "read-env-var_0_1_0_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "read-env-var"; @@ -137063,6 +139536,20 @@ self: { homepage = "https://github.com/cdepillabout/read-env-var#readme"; description = "Functions for safely reading environment variables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "read-env-var" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "read-env-var"; + version = "0.1.0.1"; + sha256 = "21962cca51ae11bacf7d92f1436cc76e76ff2d957fb81a0f7a8bcbcf1d0f2fe5"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/read-env-var#readme"; + description = "Functions for safely reading environment variables"; + license = stdenv.lib.licenses.bsd3; }) {}; "readable" = callPackage @@ -138875,7 +141362,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "relational-query" = callPackage + "relational-query_0_8_3_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words , template-haskell, text, th-reify-compat, time, time-locale-compat @@ -138896,6 +141383,30 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Typeful, Modular, Relational, algebraic query engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "relational-query" = callPackage + ({ mkDerivation, array, base, bytestring, containers, dlist + , names-th, persistable-record, quickcheck-simple, sql-words + , template-haskell, text, th-reify-compat, time, time-locale-compat + , transformers + }: + mkDerivation { + pname = "relational-query"; + version = "0.8.3.1"; + sha256 = "58451604364d41e9ec1db6ab80064485a24b20917bc979e0de6fab71ec0c8375"; + libraryHaskellDepends = [ + array base bytestring containers dlist names-th persistable-record + sql-words template-haskell text th-reify-compat time + time-locale-compat transformers + ]; + testHaskellDepends = [ + base containers quickcheck-simple transformers + ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Typeful, Modular, Relational, algebraic query engine"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -139013,6 +141524,8 @@ self: { pname = "reload"; version = "0.0.0.1"; sha256 = "4515ad09d61062a04aa34f610bbc4d6176c5468081ca30ea971a3fec36160f50"; + revision = "1"; + editedCabalFile = "45a0c196afbd549ce9e298bdae1c74475ff6f94848e91add5690d3db6ebaa281"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139029,7 +141542,7 @@ self: { wai-handler-launch wai-middleware-static wai-websockets warp websockets ]; - homepage = "https://github.com/jpmoresmau/dbIDE/reload#readme"; + homepage = "https://github.com/jpmoresmau/reload#readme"; description = "A web based Haskell IDE"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139961,7 +142474,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "resourcet" = callPackage + "resourcet_1_1_7_4" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -139978,6 +142491,26 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "resourcet" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.7.5"; + sha256 = "05d30e225eb96a300718ec0534ffb03cb3bb8c7f87d463dbddb115d01c7f405a"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; }) {}; "respond" = callPackage @@ -140044,6 +142577,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; + revision = "1"; + editedCabalFile = "49f387b0ae7279cc04bbb7975b729df487a3670e1dab896239359f5073f5f158"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -140096,6 +142631,8 @@ self: { pname = "rest-gen"; version = "0.19.0.3"; sha256 = "9ed4224ed8de81c56000b6814724bfed46f4e7b8890fe5892d308b6edcab2e76"; + revision = "1"; + editedCabalFile = "d613ead87b1c5a0a7fee13c46dc42edf4c9e486277a14f1a3ce5314799963abd"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -140139,6 +142676,7 @@ self: { base base-compat bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string ]; + jailbreak = true; description = "Rest driver for Snap"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140151,8 +142689,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; - revision = "3"; - editedCabalFile = "33fa62a06fc1c77f4e77c603b0a19678eab9695402e20e56556c6fd090e332dd"; + revision = "4"; + editedCabalFile = "5ba1b7bef91969bc4d1319ab72e78b4063e1bbc9620787e7306b95b1390f9897"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -140170,6 +142708,8 @@ self: { pname = "rest-types"; version = "1.14.1.1"; sha256 = "b7e08e65bbae20bd891f0905c9c785184182172094673ab13e66499e4fe3969a"; + revision = "1"; + editedCabalFile = "8e9eca95758568488ae115f3a807ef05d309e193ecac3e740569eb43de37fc22"; libraryHaskellDepends = [ aeson base base-compat case-insensitive generic-aeson generic-xmlpickler hxt json-schema rest-stringmap text uuid @@ -141008,6 +143548,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rlwe-challenges" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, containers + , directory, DRBG, filepath, http-client, http-conduit, lol + , MonadRandom, mtl, nist-beacon, options, parsec, protocol-buffers + , protocol-buffers-descriptor, reflection, tagged, time + , transformers + }: + mkDerivation { + pname = "rlwe-challenges"; + version = "0.0.0.1"; + sha256 = "6a4c81357d92850790834fd570cd32c50bf07f0d80cf5f1c402c044588dc76f5"; + revision = "7"; + editedCabalFile = "71843308056de4beca80a87b7585129e14f2da528abc559f328af1b1c039d0f1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lol MonadRandom protocol-buffers protocol-buffers-descriptor + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring containers directory DRBG filepath + http-client http-conduit lol MonadRandom mtl nist-beacon options + parsec protocol-buffers reflection tagged time transformers + ]; + homepage = "https://github.com/cpeikert/Lol"; + description = "Ring-LWE/LWR challenges using Lol"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "rmonad" = callPackage ({ mkDerivation, base, containers, HUnit, suitable, test-framework , test-framework-hunit, transformers @@ -141468,12 +144036,17 @@ self: { }) {}; "roundRobin" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, QuickCheck, semigroups, tasty + , tasty-quickcheck + }: mkDerivation { pname = "roundRobin"; - version = "0.1.1.0"; - sha256 = "a0cea3a792d4a4286a574e40694bc913ba0c77b5ba21d47142b117917e5b94b2"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "c7a1f44b113fb03e66415962ab240fdfb9d60c805a237084a13b29b65809ecdf"; + libraryHaskellDepends = [ base semigroups ]; + testHaskellDepends = [ + base QuickCheck semigroups tasty tasty-quickcheck + ]; description = "A simple round-robin data type"; license = stdenv.lib.licenses.mit; }) {}; @@ -142011,6 +144584,27 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "ruin" = callPackage + ({ mkDerivation, base, binary, cereal, deepseq, ghc-prim, hspec + , lens, mtl, optparse-applicative, parsec, should-not-typecheck + , smallcheck, template-haskell, unordered-containers + }: + mkDerivation { + pname = "ruin"; + version = "0.1.0.1"; + sha256 = "d3b7ac795311de47acc72cad716b27fbe82b083dfd8528c508a0c455f155541d"; + libraryHaskellDepends = [ + base binary cereal deepseq ghc-prim parsec template-haskell + unordered-containers + ]; + testHaskellDepends = [ + base hspec lens mtl optparse-applicative should-not-typecheck + smallcheck template-haskell + ]; + description = "Pliable records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ruler" = callPackage ({ mkDerivation, base, containers, mtl, shuffle, uhc-util, uuagc , uuagc-cabal, uulib @@ -142373,6 +144967,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "safepath" = callPackage + ({ mkDerivation, base, doctest, text, validity }: + mkDerivation { + pname = "safepath"; + version = "0.1.0.0"; + sha256 = "72652946831f67add13a8d16a0597d49292495628b9929e756345d2f8206e8f2"; + libraryHaskellDepends = [ base text validity ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/githubuser/safepath#readme"; + description = "Safe Paths in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "safer-file-handles" = callPackage ({ mkDerivation, base, base-unicode-symbols, explicit-iomodes , pathtype, regional-pointers, regions, transformers @@ -143752,8 +146359,8 @@ self: { pname = "scotty"; version = "0.11.0"; sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed"; - revision = "2"; - editedCabalFile = "d26457a20e549b7577daf798b5bd7cdfca4e6b21e39b345175b7841e7660d22e"; + revision = "3"; + editedCabalFile = "03a2f153eb5cf597435251169e49c42066b4ee058fd20d31e2cecec52e6578bc"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive data-default-class fail http-types monad-control mtl nats network @@ -145498,8 +148105,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.3.0.0"; - sha256 = "8f93e254ea5c09319b0636694a323d2a817d7b606631e3cccdf1bc8c5770659a"; + version = "0.3.0.3"; + sha256 = "50b7a4e28ccd95169f1eb0159c302ea517c68cf35f57507ea59a2dea8ddc4474"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145528,14 +148135,13 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.1.0.0"; - sha256 = "8e024143fc82d5564b4408c5e4fae964261002e52aa7b0a7a67e1154d114dccc"; + version = "0.2.0.1"; + sha256 = "25fe8eaeb71fb33a9406b15c93bac7c342eef6b7d7d939c42865b1f4fae5d6f0"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl persistent persistent-postgresql persistent-template pwstore-fast servant-auth-token-api servant-server text time transformers uuid ]; - jailbreak = true; homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; @@ -145547,8 +148153,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.1.2.0"; - sha256 = "3f63d151599a7f52a8d097ec9bc1bed5303246a8ab46562add9fc32a74836335"; + version = "0.2.1.0"; + sha256 = "c0e5a437cce5e636dbb9a6b4e4d3fafa66ade9d59e0264fe520227796977d33a"; libraryHaskellDepends = [ aeson aeson-injector base lens servant servant-docs servant-swagger swagger2 text @@ -145564,8 +148170,8 @@ self: { pname = "servant-blaze"; version = "0.7.1"; sha256 = "90ed1c7a22b83bee344ef3896203f3699b7633bf986ffa064752c3596c072646"; - revision = "1"; - editedCabalFile = "90e239eb13bad18f9a41521580ff97f95550db33b0404f0a3ba04593fa6dee88"; + revision = "2"; + editedCabalFile = "a71af15b94933ca8330922f24c10bd5da0de630b8ff364d830c43c3cfa35b7e3"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Blaze-html support for servant"; @@ -146261,19 +148867,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-smsc-ru" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, HUnit, mtl, QuickCheck, quickcheck-text + , scientific, servant, servant-client, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "servant-smsc-ru"; + version = "0.1.0.0"; + sha256 = "f6a7bc5824cc76a3aa1650f0d729d0dd5d4657f6d68898c4d6ea260a31f8e5ed"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls mtl scientific + servant servant-client text transformers + ]; + testHaskellDepends = [ + aeson base bytestring HUnit QuickCheck quickcheck-text tasty + tasty-hunit tasty-quickcheck text + ]; + homepage = "https://github.com/NCrashed/servant-smsc-ru#readme"; + description = "Servant client for smsc.ru service for sending SMS to cell phones"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-subscriber" = callPackage - ({ mkDerivation, aeson, aeson-compat, async, attoparsec, base - , base-compat, blaze-builder, blaze-html, blaze-markup, bytestring - , case-insensitive, containers, directory, filepath, hspec - , http-media, http-types, lens, lifted-base, lucid, monad-control - , monad-logger, mtl, network-uri, purescript-bridge, servant - , servant-foreign, servant-server, stm, string-conversions, text - , time, transformers, wai, wai-websockets, warp, websockets + ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder + , bytestring, case-insensitive, containers, directory, filepath + , http-types, lens, lifted-base, monad-control, monad-logger + , network-uri, purescript-bridge, servant, servant-foreign + , servant-server, stm, text, time, transformers, wai + , wai-websockets, warp, websockets }: mkDerivation { pname = "servant-subscriber"; - version = "0.2.0.1"; - sha256 = "2e4f7084e8fd8caaee9cb7d8e37d9466c78a49e83e846e147a4727a60d4330df"; + version = "0.3.0.0"; + sha256 = "63096205ce9465ba113d4b1f8823036b0a68f7190682e5e80464114e2595ac37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146284,11 +148912,6 @@ self: { wai-websockets warp websockets ]; executableHaskellDepends = [ base purescript-bridge ]; - testHaskellDepends = [ - aeson aeson-compat attoparsec base base-compat blaze-html - blaze-markup bytestring directory hspec http-media lucid mtl - servant-foreign servant-server string-conversions time wai warp - ]; homepage = "http://github.com/eskimor/servant-subscriber#readme"; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; @@ -146521,6 +149144,7 @@ self: { base bytestring nonce path-pieces serversession snap snap-core text time transformers unordered-containers ]; + jailbreak = true; homepage = "https://github.com/yesodweb/serversession"; description = "Snap bindings for serversession"; license = stdenv.lib.licenses.mit; @@ -147689,14 +150313,15 @@ self: { "shellmate" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, process - , temporary, transformers + , temporary, transformers, unix }: mkDerivation { pname = "shellmate"; - version = "0.3.2.2"; - sha256 = "e764d74052e75c7a35eec576ee3452bedfa1939b5947d42056e48acca724e36d"; + version = "0.3.3"; + sha256 = "4b104089f1c46f05c1c86592ecfeee507092106d862c31c6ca4d95e52180c689"; libraryHaskellDepends = [ base bytestring directory filepath process temporary transformers + unix ]; homepage = "https://github.com/valderman/shellmate"; description = "Simple interface for shell scripting in Haskell"; @@ -147709,8 +150334,8 @@ self: { }: mkDerivation { pname = "shellmate-extras"; - version = "0.3.2"; - sha256 = "60dc69eb1ba7eab6481e7701941ca4f3a595f5ed1871ed6b5329f74ff1dd5dd5"; + version = "0.3.3"; + sha256 = "fa3ade318f08c7b4d21bff10a82703480fb9ee3e572083be5cb99c0974e7a6a3"; libraryHaskellDepends = [ base bytestring feed HTTP mime-types network-uri shellmate tagsoup text xml @@ -148815,6 +151440,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "simple-zipper" = callPackage + ({ mkDerivation, base, hspec, lens }: + mkDerivation { + pname = "simple-zipper"; + version = "0.1.0.0"; + sha256 = "5effbfc34606e59f411e4f49e1574d841722d89f5e0023e37ec49f602e4e25aa"; + libraryHaskellDepends = [ base lens ]; + testHaskellDepends = [ base hspec lens ]; + homepage = "https://github.com/DanielWaterworth/simple-zipper"; + description = "Zippers made slightly easier"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simpleargs" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -149201,18 +151839,19 @@ self: { }) {}; "sized" = callPackage - ({ mkDerivation, base, constraints, containers, ListLike - , monomorphic, type-natural, vector + ({ mkDerivation, base, constraints, containers, deepseq + , equational-reasoning, hashable, lens, ListLike, mono-traversable + , monomorphic, singletons, type-natural, vector }: mkDerivation { pname = "sized"; - version = "0.1.0.0"; - sha256 = "14beecab5676c30cec8b3a94e60feb9752ebeb8ca9a520896f868d39cf72c902"; + version = "0.2.0.0"; + sha256 = "31f9233885bbe758a4c2f890e65695e11c64abdc12b6d4931427570cd7d4587c"; libraryHaskellDepends = [ - base constraints containers ListLike monomorphic type-natural + base constraints containers deepseq equational-reasoning hashable + lens ListLike mono-traversable monomorphic singletons type-natural vector ]; - jailbreak = true; description = "Sized sequence data-types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -149505,7 +152144,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "slave-thread" = callPackage + "slave-thread_1_0_1_1" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore , stm-containers, transformers @@ -149521,10 +152160,33 @@ self: { testHaskellDepends = [ base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/slave-thread"; description = "A principal solution to ghost threads and silent exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "slave-thread" = callPackage + ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph + , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore + , stm-containers, transformers + }: + mkDerivation { + pname = "slave-thread"; + version = "1.0.2"; + sha256 = "e47120598dd65ebee33253911a31518021323a5ccfa52588e13c44fd5f5b4b13"; + libraryHaskellDepends = [ + base base-prelude list-t mmorph partial-handler stm-containers + transformers + ]; + testHaskellDepends = [ + base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore + ]; + homepage = "https://github.com/nikita-volkov/slave-thread"; + description = "A principal solution to ghost threads and silent exceptions"; + license = stdenv.lib.licenses.mit; }) {}; "sleep" = callPackage @@ -149574,6 +152236,7 @@ self: { aeson base bytestring MonadCatchIO-transformers mtl pandoc snap-core snap-server utf8-string ]; + jailbreak = true; description = "ws convert markdown to reveal-js"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -149630,7 +152293,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "slug" = callPackage + "slug_0_1_4" = callPackage ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent , QuickCheck, test-framework, test-framework-quickcheck2, text }: @@ -149648,6 +152311,27 @@ self: { homepage = "https://github.com/mrkkrp/slug"; description = "Type-safe slugs for Yesod ecosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "slug" = callPackage + ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent + , QuickCheck, test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "slug"; + version = "0.1.5"; + sha256 = "6bc271612759fd9a415ee382b620b0f5b1154c762eb3469a409dafd5f35282fc"; + libraryHaskellDepends = [ + aeson base exceptions path-pieces persistent text + ]; + testHaskellDepends = [ + base exceptions path-pieces QuickCheck test-framework + test-framework-quickcheck2 text + ]; + homepage = "https://github.com/mrkkrp/slug"; + description = "Type-safe slugs for Yesod ecosystem"; + license = stdenv.lib.licenses.bsd3; }) {}; "smallarray" = callPackage @@ -149898,7 +152582,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie" = callPackage + "smoothie_0_4_2_2" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { pname = "smoothie"; @@ -149908,6 +152592,19 @@ self: { homepage = "https://github.com/phaazon/smoothie"; description = "Smooth curves via several interpolation modes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "smoothie" = callPackage + ({ mkDerivation, aeson, base, linear, text, vector }: + mkDerivation { + pname = "smoothie"; + version = "0.4.2.3"; + sha256 = "ae9f1fd411fc6c57ce4f3d51f23f96ef6cc8362a3df3f932e0fcfa988029e84d"; + libraryHaskellDepends = [ aeson base linear text vector ]; + homepage = "https://github.com/phaazon/smoothie"; + description = "Smooth curves via several interpolation modes"; + license = stdenv.lib.licenses.bsd3; }) {}; "smsaero" = callPackage @@ -150073,7 +152770,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "snap" = callPackage + "snap_0_14_0_7" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , clientsession, comonad, configurator, containers, directory , directory-tree, dlist, either, filepath, hashable, heist, lens @@ -150107,6 +152804,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snap" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal + , clientsession, configurator, containers, deepseq, directory + , directory-tree, dlist, filepath, Glob, hashable, heist + , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control + , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core + , snap-server, stm, syb, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-smallcheck, text, time + , transformers, transformers-base, unordered-containers, xmlhtml + }: + mkDerivation { + pname = "snap"; + version = "1.0.0.0"; + sha256 = "95f568ce5a4a688076fd1b035fa32a7a243f85dda56260cd95b917f391d69101"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring cereal clientsession configurator + containers directory directory-tree dlist filepath hashable heist + lens lifted-base map-syntax monad-control mtl mwc-random + pwstore-fast snap-core snap-server stm text time transformers + transformers-base unordered-containers xmlhtml + ]; + testHaskellDepends = [ + aeson async attoparsec base bytestring cereal clientsession + configurator containers deepseq directory directory-tree dlist + filepath Glob hashable heist http-streams HUnit lens lifted-base + map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck + smallcheck snap-core snap-server stm syb test-framework + test-framework-hunit test-framework-quickcheck2 + test-framework-smallcheck text time transformers transformers-base + unordered-containers xmlhtml + ]; + homepage = "http://snapframework.com/"; + description = "Top-level package for the Snap Web Framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snap-accept" = callPackage ({ mkDerivation, base, http-media, snap-core }: mkDerivation { @@ -150158,8 +152892,8 @@ self: { ({ mkDerivation, base, blaze-html, snap-core }: mkDerivation { pname = "snap-blaze"; - version = "0.2.1.3"; - sha256 = "95d6ef50ff08d7b1883ab65acb4729a8dbec6b770f9f31799870b5fdf0f4f14a"; + version = "0.2.1.4"; + sha256 = "381a8cf8f211be77b9d52c2aa6b880e7059384fe0124c69d704040b0c016302b"; libraryHaskellDepends = [ base blaze-html snap-core ]; homepage = "http://github.com/jaspervdj/snap-blaze"; description = "blaze-html integration for Snap"; @@ -150193,7 +152927,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "snap-core" = callPackage + "snap-core_0_9_8_0" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , blaze-builder, blaze-builder-enumerator, bytestring , bytestring-mmap, case-insensitive, containers, deepseq, directory @@ -150217,6 +152951,41 @@ self: { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "snap-core" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder + , case-insensitive, containers, deepseq, directory, filepath + , hashable, HUnit, io-streams, lifted-base, monad-control, mtl + , old-locale, parallel, QuickCheck, random, readable, regex-posix + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, transformers, transformers-base, unix-compat + , unordered-containers, vector, zlib + }: + mkDerivation { + pname = "snap-core"; + version = "1.0.0.0"; + sha256 = "9c35a657fc0debbe9df605d7528ce4645c0b4bc4b94b0134116f6746fe980adb"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers directory filepath HUnit io-streams lifted-base + monad-control mtl old-locale random readable regex-posix text time + transformers transformers-base unix-compat unordered-containers + vector + ]; + testHaskellDepends = [ + attoparsec base bytestring bytestring-builder case-insensitive + containers deepseq directory filepath hashable HUnit io-streams + lifted-base monad-control mtl old-locale parallel QuickCheck random + readable regex-posix test-framework test-framework-hunit + test-framework-quickcheck2 text time transformers transformers-base + unix-compat unordered-containers vector zlib + ]; + doCheck = false; + homepage = "http://snapframework.com/"; + description = "Snap: A Haskell Web Framework (core interfaces and types)"; + license = stdenv.lib.licenses.bsd3; }) {}; "snap-cors" = callPackage @@ -150310,12 +153079,11 @@ self: { }: mkDerivation { pname = "snap-language"; - version = "0.1.0.0"; - sha256 = "a8b4de97769afd815ebde10ad778ad20d9ba81883680e1a2514a7989bce32a41"; + version = "0.1.0.2"; + sha256 = "9812f257776f36f2a160c211d64f7320473279acdab411c44bf45a411b4ca936"; libraryHaskellDepends = [ attoparsec base bytestring containers snap-core ]; - jailbreak = true; homepage = "https://github.com/jonpetterbergman/snap-accept-language"; description = "Language handling for Snap"; license = stdenv.lib.licenses.bsd3; @@ -150327,15 +153095,14 @@ self: { }: mkDerivation { pname = "snap-loader-dynamic"; - version = "0.10.0.4"; - sha256 = "f502f7cae63c5ee5c26be5a5e751fc211d922193dc88b3bae9ab447b70b659c0"; + version = "1.0.0.0"; + sha256 = "8f1770de14e3039eb78f5455e69bdf40c9b1aa5b5d831810abd4f1eb67abfb8b"; libraryHaskellDepends = [ base directory directory-tree hint mtl snap-core template-haskell time unix ]; - jailbreak = true; homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework: dynamic loader"; + description = "Snap dynamic loader"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -150344,14 +153111,11 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "snap-loader-static"; - version = "0.9.0.2"; - sha256 = "357cde7b671a623d0d0b6b6a658a900bba74d886bb43c0a714daf9ec8d3dda34"; - revision = "1"; - editedCabalFile = "c927448783c28f56bd57c7b09d147965b96e7b4c7320524b26c83bf10ab89c21"; + version = "1.0.0.0"; + sha256 = "5af51d870fc96823eb063aff1bd0db5b70fac140a2226d97473c804090752912"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework: static loader"; + description = "Snap static loader"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150400,7 +153164,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap-server" = callPackage + "snap-server_0_9_5_1" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , blaze-builder, blaze-builder-enumerator, bytestring , case-insensitive, containers, enumerator, HsOpenSSL @@ -150424,6 +153188,63 @@ self: { homepage = "http://snapframework.com/"; description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "snap-server" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder + , bytestring, bytestring-builder, case-insensitive, clock + , containers, deepseq, directory, filepath, HsOpenSSL, http-common + , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base + , monad-control, mtl, network, old-locale, openssl-streams + , parallel, QuickCheck, random, snap-core, test-framework + , test-framework-hunit, test-framework-quickcheck2, text, threads + , time, transformers, unix, unix-compat, vector + }: + mkDerivation { + pname = "snap-server"; + version = "1.0.0.0"; + sha256 = "dd92414cf5005f548d54ed246c1de92ce47f7f75e1a160ff31a590f9fa50aa61"; + configureFlags = [ "-fopenssl" ]; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring bytestring-builder + case-insensitive clock containers filepath HsOpenSSL io-streams + io-streams-haproxy lifted-base mtl network old-locale + openssl-streams snap-core text time unix unix-compat vector + ]; + testHaskellDepends = [ + attoparsec base base16-bytestring blaze-builder bytestring + bytestring-builder case-insensitive clock containers deepseq + directory filepath HsOpenSSL http-common http-streams HUnit + io-streams io-streams-haproxy lifted-base monad-control mtl network + old-locale openssl-streams parallel QuickCheck random snap-core + test-framework test-framework-hunit test-framework-quickcheck2 text + threads time transformers unix unix-compat vector + ]; + doCheck = false; + homepage = "http://snapframework.com/"; + description = "A web server for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "snap-templates" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , directory-tree, filepath, hashable, old-time, template-haskell + , text + }: + mkDerivation { + pname = "snap-templates"; + version = "1.0.0.0"; + sha256 = "f6289348179d07721f6edc1dbe19bcfe989de0dd2945962c455e2ce113d2561b"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers directory directory-tree filepath + hashable old-time template-haskell text + ]; + homepage = "http://snapframework.com/"; + description = "Scaffolding CLI for the Snap Framework"; + license = stdenv.lib.licenses.bsd3; }) {}; "snap-testing" = callPackage @@ -150936,20 +153757,18 @@ self: { "snaplet-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, clientsession, configurator - , lens, MonadCatchIO-transformers, mtl, postgresql-simple - , resource-pool-catchio, snap, text, transformers + , lens, lifted-base, monad-control, mtl, postgresql-simple + , resource-pool, snap, text, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "0.6.0.4"; - sha256 = "44cca67347a81257533edc9570bf9303081a11d40e8000390a75f3f48e071687"; - revision = "2"; - editedCabalFile = "0461cfe249bc8f9b3fd32715e66ed38d0b67805f9ac8d3d2fb6782fd7fe34c94"; + version = "1.0"; + sha256 = "79ecdd55c04ef2f3f6a7ba4c21eb7f2c42c824fe016b6308623b81257d96c22d"; libraryHaskellDepends = [ - base bytestring clientsession configurator lens - MonadCatchIO-transformers mtl postgresql-simple - resource-pool-catchio snap text transformers unordered-containers + base bytestring clientsession configurator lens lifted-base + monad-control mtl postgresql-simple resource-pool snap text + transformers transformers-base unordered-containers ]; jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; @@ -150988,6 +153807,7 @@ self: { base configurator mtl raw-strings-qq shelly snap snap-core string-conv text transformers ]; + jailbreak = true; description = "Automatic (re)compilation of purescript projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -151006,6 +153826,7 @@ self: { aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text transformers ]; + jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -151111,6 +153932,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "snaplet-scoped-session" = callPackage + ({ mkDerivation, async, base, classy-prelude, configurator + , data-default, lens, mtl, snap, time, unordered-containers + }: + mkDerivation { + pname = "snaplet-scoped-session"; + version = "0.1.1"; + sha256 = "06c7b93f64d9c287e5412288398237a19e124265c2efc4f452cf7904159a7f2f"; + libraryHaskellDepends = [ + async base classy-prelude configurator data-default lens mtl snap + time unordered-containers + ]; + homepage = "https://github.com/JustusAdam/snaplet-scoped-session#readme"; + description = "Modularised session state for Snaplets, in a Snaplet"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "snaplet-sedna" = callPackage ({ mkDerivation, base, bytestring, containers, monad-control, mtl , resource-pool, sednaDBXML, snap @@ -151606,7 +154444,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "socket" = callPackage + "socket_0_6_0_1" = callPackage ({ mkDerivation, async, base, bytestring }: mkDerivation { pname = "socket"; @@ -151617,6 +154455,39 @@ self: { homepage = "https://github.com/lpeterse/haskell-socket"; description = "An extensible socket library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "socket" = callPackage + ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }: + mkDerivation { + pname = "socket"; + version = "0.6.1.0"; + sha256 = "c010f5b5c705483f52a8c1d45f07f57b49e8b61c07187bc3e50d658c72c409e6"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ async base bytestring tasty tasty-hunit ]; + homepage = "https://github.com/lpeterse/haskell-socket"; + description = "An extensible socket library"; + license = stdenv.lib.licenses.mit; + }) {}; + + "socket_0_6_2_0" = callPackage + ({ mkDerivation, async, base, bytestring, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "socket"; + version = "0.6.2.0"; + sha256 = "c7aed50b213c56c03f22a537acfd794e99564f50f412ec2dcaee6dd9cd9bad1c"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + jailbreak = true; + homepage = "https://github.com/lpeterse/haskell-socket"; + description = "An extensible socket library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -152425,15 +155296,12 @@ self: { }: mkDerivation { pname = "species"; - version = "0.3.4.2"; - sha256 = "9e1683448aa2152561c65b02fb832e366ce9f47542e5e963abd82d5e08eeb11f"; - revision = "1"; - editedCabalFile = "397aa0a55ea7021bec1f866b9dde980b9ae67319ae2838339f865babf856c431"; + version = "0.4"; + sha256 = "b632c9b03fa580e5206b3cd9ca9124a6b953acde83e7564e30c6a20260a6c912"; libraryHaskellDepends = [ base containers multiset-comb np-extras numeric-prelude template-haskell ]; - jailbreak = true; description = "Computational combinatorial species"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -153101,12 +155969,14 @@ self: { }: mkDerivation { pname = "sqlite"; - version = "0.5.3"; - sha256 = "fe07fb757e8d579e6f9fbfe76659dbb4249ffec234e306848f54a1781df187c2"; + version = "0.5.5"; + sha256 = "d3bfd3754622ab17fe2b4315402d12fdfd3b5445de741716b75655aebd9b4bc4"; libraryHaskellDepends = [ base bytestring directory pretty time utf8-string ]; librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/GaloisInc/sqlite"; description = "Haskell binding to sqlite3"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) sqlite;}; @@ -153504,8 +156374,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "0.1.4"; - sha256 = "43638fcebb20101edbb4b0e7919eae44f2021754fcb7aa6b145df5f91db203dd"; + version = "0.1.6"; + sha256 = "078e223a2549f08ee48b2c9d40f7242992b5870e02eef2f9ef1ea8d542ff4e36"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -153544,8 +156414,8 @@ self: { pname = "stack"; version = "1.1.2"; sha256 = "fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625"; - revision = "6"; - editedCabalFile = "9b8c21c5af64fe74772ea3f17e2a1fe8d295a083948e6631bbaa81f3305b2d95"; + revision = "7"; + editedCabalFile = "af269ebe5ac7a096cd4b44af570643c1e48444a4b9eb01dc8f97c8fb53eea55f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154605,13 +157475,12 @@ self: { ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }: mkDerivation { pname = "step-function"; - version = "0.1.1.0"; - sha256 = "cdfdc05d8724f5ccea56fe600730943b30827c44e032913f865855fa42bded0e"; + version = "0.1.1.1"; + sha256 = "9ef61ac680115f602520b23b53ec2d0232860c8baf1e2f7735259cc001287e05"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck QuickCheck ]; - jailbreak = true; homepage = "https://github.com/jonpetterbergman/step-function"; description = "Step functions, staircase functions or piecewise constant functions"; license = stdenv.lib.licenses.bsd3; @@ -154787,7 +157656,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stm-containers" = callPackage + "stm-containers_0_2_14" = callPackage ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive , QuickCheck, transformers, unordered-containers @@ -154804,10 +157673,34 @@ self: { mtl-prelude placeholders primitive QuickCheck transformers unordered-containers ]; + jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/stm-containers"; description = "Containers for STM"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stm-containers" = callPackage + ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF + , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive + , QuickCheck, transformers, unordered-containers + }: + mkDerivation { + pname = "stm-containers"; + version = "0.2.15"; + sha256 = "452483bcbe131475c216a463b67c3c43011a3e26493e0365379ce2ba6bd6b2e0"; + libraryHaskellDepends = [ + base base-prelude focus hashable list-t primitive transformers + ]; + testHaskellDepends = [ + base base-prelude focus free hashable HTF list-t loch-th mtl + mtl-prelude placeholders primitive QuickCheck transformers + unordered-containers + ]; + homepage = "https://github.com/nikita-volkov/stm-containers"; + description = "Containers for STM"; + license = stdenv.lib.licenses.mit; }) {}; "stm-delay" = callPackage @@ -155179,36 +158072,38 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, base, base-orphans, bytestring, cereal - , cereal-vector, conduit, containers, criterion, cryptohash - , deepseq, fail, ghc-prim, hashable, hspec, hspec-smallcheck - , integer-gmp, lifted-base, monad-control, mono-traversable - , primitive, resourcet, safe, semigroups, smallcheck, store-core - , syb, template-haskell, text, th-lift, th-lift-instances - , th-orphans, th-reify-many, th-utilities, time, transformers - , unordered-containers, vector, vector-binary-instances, void - , weigh + ({ mkDerivation, array, base, base-orphans, base64-bytestring + , bytestring, cereal, cereal-vector, conduit, containers, criterion + , cryptohash, deepseq, directory, fail, filepath, ghc-prim + , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base + , monad-control, mono-traversable, primitive, resourcet, safe + , semigroups, smallcheck, store-core, syb, template-haskell, text + , th-lift, th-lift-instances, th-orphans, th-reify-many + , th-utilities, time, transformers, unordered-containers, vector + , vector-binary-instances, void, weigh }: mkDerivation { pname = "store"; - version = "0.2.0.0"; - sha256 = "d00fc9a44436e24a14e26a0a838a7639ed3de8fa391d0aeab1374adae011653c"; + version = "0.2.1.0"; + sha256 = "8f6724dc7fcf97af160106bc546d33b07ac290c81349a6c72b5db18dea6a8d6d"; libraryHaskellDepends = [ - array base base-orphans bytestring conduit containers cryptohash - deepseq fail ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable primitive resourcet safe - semigroups smallcheck store-core syb template-haskell text th-lift + array base base-orphans base64-bytestring bytestring conduit + containers cryptohash deepseq directory fail filepath ghc-prim + hashable hspec hspec-smallcheck integer-gmp lifted-base + monad-control mono-traversable primitive resourcet safe semigroups + smallcheck store-core syb template-haskell text th-lift th-lift-instances th-orphans th-reify-many th-utilities time transformers unordered-containers vector void ]; testHaskellDepends = [ - array base base-orphans bytestring cereal cereal-vector conduit - containers criterion cryptohash deepseq fail ghc-prim hashable - hspec hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable primitive resourcet safe semigroups smallcheck - store-core syb template-haskell text th-lift th-lift-instances - th-orphans th-reify-many th-utilities time transformers - unordered-containers vector vector-binary-instances void weigh + array base base-orphans base64-bytestring bytestring cereal + cereal-vector conduit containers criterion cryptohash deepseq + directory fail filepath ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable primitive + resourcet safe semigroups smallcheck store-core syb + template-haskell text th-lift th-lift-instances th-orphans + th-reify-many th-utilities time transformers unordered-containers + vector vector-binary-instances void weigh ]; doCheck = false; homepage = "https://github.com/fpco/store#readme"; @@ -155287,8 +158182,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.1.3"; - sha256 = "d81a3de21692d6d326306b8c427598a4cc7642ed5ecd158c413d183c86e0b694"; + version = "0.1.4"; + sha256 = "2ca934bbc3d43c9df9ffc950dcf49873a23f428081607880f4458d5c69285de3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156186,8 +159081,8 @@ self: { }: mkDerivation { pname = "strive"; - version = "3.0.0"; - sha256 = "9fa6409127c240846e11d1c7e8746dfa6f5713af90db46cc60f6ff05507556b0"; + version = "3.0.1"; + sha256 = "3a03d0b5c1ac8121be624dedd995c17c99543428225789483693ca7a69654a69"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -156281,7 +159176,6 @@ self: { homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "structured-mongoDB" = callPackage @@ -157162,6 +160056,33 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "swagger2_2_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , containers, doctest, generics-sop, Glob, hashable, hspec + , http-media, HUnit, insert-ordered-containers, lens, mtl, network + , QuickCheck, scientific, template-haskell, text, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.1.2.1"; + sha256 = "112b053db3cbeeeea9c7b43cb0f07a6ea9f73715ac5883b2eee9c2855c444930"; + libraryHaskellDepends = [ + aeson base base-compat containers generics-sop hashable http-media + insert-ordered-containers lens mtl network scientific + template-haskell text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + text time unordered-containers vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -158592,7 +161513,7 @@ self: { license = "GPL"; }) {}; - "tagged" = callPackage + "tagged_0_8_4" = callPackage ({ mkDerivation, base, deepseq, template-haskell }: mkDerivation { pname = "tagged"; @@ -158602,9 +161523,10 @@ self: { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tagged_0_8_5" = callPackage + "tagged" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers , transformers-compat }: @@ -158618,7 +161540,6 @@ self: { homepage = "http://github.com/ekmett/tagged"; description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged-binary" = callPackage @@ -159167,6 +162088,8 @@ self: { pname = "tardis"; version = "0.4.1.0"; sha256 = "e672abadd75055c2372d722c98058f7f3403fcca18258565d1cdd8e0dc25a5d9"; + revision = "1"; + editedCabalFile = "7b45b8fba6db18e5fcfb22dab3de1809b88e8fda6a202a32da308507d2dde6f2"; libraryHaskellDepends = [ base mmorph mtl ]; homepage = "https://github.com/DanBurton/tardis"; description = "Bidirectional state monad transformer"; @@ -159291,6 +162214,8 @@ self: { pname = "tasty"; version = "0.11.0.3"; sha256 = "ca51533c3b6fb36a63b7a6062d71024e3a823ae173779c1c81850959e29e7efa"; + revision = "1"; + editedCabalFile = "65ddea88e2f32a40483dc873704a8b6b684548b5c61400440c4dda1bdbcbd5f3"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative regex-tdfa stm tagged unbounded-delays @@ -159884,7 +162809,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "telegram-api" = callPackage + "telegram-api_0_4_3_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either , filepath, hjpath, hspec, http-api-data, http-client , http-client-tls, http-media, http-types, mime-types @@ -159908,6 +162833,33 @@ self: { homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; description = "Telegram Bot API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "telegram-api" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either + , filepath, hjpath, hspec, http-api-data, http-client + , http-client-tls, http-media, http-types, mime-types + , optparse-applicative, servant, servant-client, string-conversions + , text, transformers, utf8-string + }: + mkDerivation { + pname = "telegram-api"; + version = "0.5.0.0"; + sha256 = "f971c4acd9101f4fd811a5e60b31ce2c85a09789a248e3a5473efa81d227ad93"; + libraryHaskellDepends = [ + aeson base bytestring either http-api-data http-client http-media + http-types mime-types servant servant-client string-conversions + text transformers + ]; + testHaskellDepends = [ + aeson ansi-wl-pprint base filepath hjpath hspec http-client + http-client-tls http-types optparse-applicative servant + servant-client text transformers utf8-string + ]; + homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; + description = "Telegram Bot API bindings"; + license = stdenv.lib.licenses.bsd3; }) {}; "teleport" = callPackage @@ -160040,6 +162992,21 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "templateify" = callPackage + ({ mkDerivation, base, mtl, tagsoup, uniplate }: + mkDerivation { + pname = "templateify"; + version = "0.1.0.0"; + sha256 = "ccbb2c48f9d7a6f1f3df3d00e807416bb8b7fe62fb298fb6cb9d0bb5a043d269"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base mtl tagsoup uniplate ]; + jailbreak = true; + homepage = "http://github.com/xpika/templateify"; + description = "Make template from website"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "templatepg" = callPackage ({ mkDerivation, base, binary, bytestring, haskell-src-meta, mtl , network, parsec, regex-compat, regex-posix, template-haskell @@ -161219,12 +164186,11 @@ self: { }: mkDerivation { pname = "text-icu-normalized"; - version = "0.1.5.1"; - sha256 = "a6b10fe10fbd83c23c6719879a19536ff0fdfb01b4ea42e25e014d59ed29f3a6"; + version = "0.1.6"; + sha256 = "b5487346dc50fc9a70160277ae9f32306a4f517f06815785bcc6d0fa47ce94e8"; libraryHaskellDepends = [ base base-unicode-symbols bytestring lens text text-icu ]; - jailbreak = true; homepage = "https://gitlab.com/theunixman/text-icu-normalized"; description = "Dealing with Strict Text in NFC normalization"; license = stdenv.lib.licenses.gpl3; @@ -162274,28 +165240,6 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.1.1.1"; - sha256 = "05da9652c04535fadf7a5b937fbbd96df989b787c12dd5f829919487b64aa631"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - homepage = "https://github.com/fpco/th-utilities#readme"; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; - - "th-utilities_0_2_0_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; version = "0.2.0.1"; sha256 = "65c64cee69c0d9bf8d0d5d4590aaea7dcf4177f97818526cbb3fac20901671d6"; libraryHaskellDepends = [ @@ -162309,7 +165253,7 @@ self: { homepage = "https://github.com/fpco/th-utilities#readme"; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "themoviedb" = callPackage @@ -162453,8 +165397,8 @@ self: { }: mkDerivation { pname = "these"; - version = "0.7.1"; - sha256 = "97102610f8822ce6f543d2d6219555b8696c78b2e220c7fa73fb3e9489a04439"; + version = "0.7.2"; + sha256 = "a1d22644ca30b0bf549ed9881fcadc9f93fac0ec4815008496ca16e83a966dc8"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -164935,8 +167879,8 @@ self: { ({ mkDerivation, base, containers, mtl, stm, time, transformers }: mkDerivation { pname = "transient"; - version = "0.4.2"; - sha256 = "f84b40d51daff310cfb1563fb6e813d1b047a14a1157d67375efdc05da694bda"; + version = "0.4.2.2"; + sha256 = "7c1445c12b6b38d4bad8f6461c65ad3fbbb7f81c873750f5dae14df14262fd3f"; libraryHaskellDepends = [ base containers mtl stm time transformers ]; @@ -165620,7 +168564,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tttool" = callPackage + "tttool_1_6_1_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec @@ -165642,6 +168586,31 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tttool" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, executable-path, filepath, hashable, haskeline, HPDF + , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec + , process, random, split, spool, template-haskell, time, vector + , yaml, zlib + }: + mkDerivation { + pname = "tttool"; + version = "1.6.1.2"; + sha256 = "8f5f05c91ea4f50e43924618090f7806e0649dc83edd8c1af0e05d9032098384"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base binary bytestring containers directory executable-path + filepath hashable haskeline HPDF JuicyPixels mtl natural-sort + optparse-applicative parsec process random split spool + template-haskell time vector yaml zlib + ]; + homepage = "https://github.com/entropia/tip-toi-reveng"; + description = "Working with files for the Tiptoi® pen"; + license = stdenv.lib.licenses.mit; }) {}; "tubes" = callPackage @@ -165650,8 +168619,8 @@ self: { }: mkDerivation { pname = "tubes"; - version = "2.0.0.1"; - sha256 = "4297964709dca035f9adb4cc05ae92bc8fc9501847c0e8c0703ad6d0e32df989"; + version = "2.1.1.0"; + sha256 = "967f728c0cd2b01c9544b7e523d727dbc2e12ba1b11eeffe2afc22e8f5913ba8"; libraryHaskellDepends = [ base comonad contravariant free mtl profunctors semigroups transformers @@ -166280,8 +169249,8 @@ self: { }: mkDerivation { pname = "twitch"; - version = "0.1.7.0"; - sha256 = "45579aee9ce53f729477a378320bc37755e9daf146df8297db0ed8cbf056fb36"; + version = "0.1.7.1"; + sha256 = "8158d76bcd1226fbda9a7ebaf95d01b74f542499c8dd0673c8d081ae00370cda"; libraryHaskellDepends = [ base data-default directory filepath fsnotify Glob optparse-applicative time transformers @@ -166290,7 +169259,6 @@ self: { base data-default directory filepath fsnotify Glob hspec optparse-applicative time transformers ]; - jailbreak = true; homepage = "https://github.com/jfischoff/twitch"; description = "A high level file watcher DSL"; license = stdenv.lib.licenses.mit; @@ -166368,7 +169336,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed" = callPackage + "twitter-feed_0_2_0_7" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework , test-framework-hunit @@ -166386,6 +169354,27 @@ self: { homepage = "https://github.com/stackbuilders/twitter-feed"; description = "Client for fetching Twitter timeline via Oauth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "twitter-feed" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , containers, http-conduit, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "twitter-feed"; + version = "0.2.0.8"; + sha256 = "e75182594dbd68219902c9ed7bb2a36addf9a8cdb1f456ec4eafef70b57915c4"; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring http-conduit + ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/stackbuilders/twitter-feed"; + description = "Client for fetching Twitter timeline via Oauth"; + license = stdenv.lib.licenses.mit; }) {}; "twitter-types" = callPackage @@ -166858,12 +169847,13 @@ self: { }: mkDerivation { pname = "type-natural"; - version = "0.6.0.0"; - sha256 = "6b09df942a2613f540534b3dfe014ccd649afb3e3923f3d140a0ba69dee0bc05"; + version = "0.7.1.1"; + sha256 = "16867acdf4bfe3637a9c0730eca4156d3c830abca60182d8a561c4fabe6f7231"; libraryHaskellDepends = [ base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell ]; + jailbreak = true; homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; @@ -167303,7 +170293,7 @@ self: { license = "GPL"; }) {}; - "tz" = callPackage + "tz_0_1_1_1" = callPackage ({ mkDerivation, base, binary, bindings-posix, bytestring , containers, data-default, deepseq, HUnit, QuickCheck , template-haskell, test-framework, test-framework-hunit @@ -167328,6 +170318,31 @@ self: { homepage = "https://github.com/nilcons/haskell-tz"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tz" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , deepseq, HUnit, QuickCheck, template-haskell, test-framework + , test-framework-hunit, test-framework-quickcheck2 + , test-framework-th, time, tzdata, vector + }: + mkDerivation { + pname = "tz"; + version = "0.1.2.0"; + sha256 = "b501251a446d4fe544617eaa41e2442f283f8843dd57d52820d88a9e2ce04d70"; + libraryHaskellDepends = [ + base binary bytestring containers data-default deepseq + template-haskell time tzdata vector + ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th time tzdata + ]; + preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; + homepage = "https://github.com/nilcons/haskell-tz"; + description = "Efficient time zone handling"; + license = stdenv.lib.licenses.asl20; }) {}; "tzdata" = callPackage @@ -169092,7 +172107,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "uri-bytestring" = callPackage + "uri-bytestring_0_2_1_2" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, derive, HUnit, lens-simple, QuickCheck , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -169113,6 +172128,30 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "uri-bytestring" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , containers, derive, HUnit, lens-simple, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.2.2.0"; + sha256 = "d7ab6d08e4c0b0ef2ed6ae47ec839cbc39734ea31af3178ce66a0b6896d14f0d"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers + ]; + testHaskellDepends = [ + attoparsec base blaze-builder bytestring containers derive HUnit + lens-simple QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; }) {}; "uri-conduit" = callPackage @@ -170237,8 +173276,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.0.0"; - sha256 = "38d5604e01679f6c1b6d5e7ef379d7a7ab65020a6dc788b45b1ae349e522620e"; + version = "0.3.0.1"; + sha256 = "a70eada6f9a91361cfc13a14c896b272978df57daabbc34b767c18e07d6dcbaa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -170896,8 +173935,8 @@ self: { ({ mkDerivation, base, deepseq, vector }: mkDerivation { pname = "vector-sized"; - version = "0.3.2.0"; - sha256 = "54b5978d92eae76278828476d059e8bb5170f30775380c606bd390eb53e06135"; + version = "0.3.3.0"; + sha256 = "902cc55e930ba703334425adc6090ce1ad4db38f01143fd9b92eba904c2bc58b"; libraryHaskellDepends = [ base deepseq vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -171738,8 +174777,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.7.1"; - sha256 = "63b66efc5e85e045f05b2a1222c8ed77bd3f9c04f7dfcbaaf1816c7c30c7ebe5"; + version = "5.8"; + sha256 = "29bdd4098703b64387619c97e43e2c12f84013e29bc29edf2bfc6eca8a32f9b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171983,6 +175022,8 @@ self: { pname = "wai-app-static"; version = "3.1.5"; sha256 = "28667193acfcc534752b715b5f5e16fc58edb550d03c0eb2b68e123e41030d4c"; + revision = "1"; + editedCabalFile = "c3f6628138ef318fc0a5a77949627b7ce06d149f53c21a2832b671664ea473de"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172016,8 +175057,8 @@ self: { }: mkDerivation { pname = "wai-app-static"; - version = "3.1.6"; - sha256 = "a7096d9ebb371e75953dc3e2895d90761f3b2ded6d01382530544810fdd94214"; + version = "3.1.6.1"; + sha256 = "b318acf31e2e809411f119744a016ba0a78f52554ac7321a3a1410a218886668"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172652,7 +175693,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd" = callPackage + "wai-middleware-crowd_0_1_4_1" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession , containers, cookie, gitrev, http-client, http-client-tls @@ -172679,6 +175720,36 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-middleware-crowd" = callPackage + ({ mkDerivation, authenticate, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, clientsession + , containers, cookie, gitrev, http-client, http-client-tls + , http-reverse-proxy, http-types, optparse-applicative, resourcet + , template-haskell, text, time, transformers, unix-compat, vault + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-crowd"; + version = "0.1.4.2"; + sha256 = "1136b61a6ce7729093664b63a4ab70de73e356d34b0c7a8114b639b18626b058"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + authenticate base base64-bytestring binary blaze-builder bytestring + case-insensitive clientsession containers cookie http-client + http-client-tls http-types resourcet text time unix-compat vault + wai + ]; + executableHaskellDepends = [ + base bytestring clientsession gitrev http-client http-client-tls + http-reverse-proxy http-types optparse-applicative template-haskell + text transformers wai wai-app-static wai-extra warp + ]; + description = "Middleware and utilities for using Atlassian Crowd authentication"; + license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -174397,7 +177468,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkit-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: @@ -174411,7 +177482,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkitgtk3_0_14_1_1" = callPackage ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools @@ -174430,7 +177501,7 @@ self: { description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib @@ -174449,7 +177520,7 @@ self: { description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = [ "x86_64-darwin" ]; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkitgtk3-javascriptcore_0_13_1_2" = callPackage ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit @@ -174465,7 +177536,7 @@ self: { description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webkitgtk3-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: @@ -174478,7 +177549,7 @@ self: { libraryPkgconfigDepends = [ webkit ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) webkit;}; + }) {webkit = null;}; "webpage" = callPackage ({ mkDerivation, base, blaze-html, data-default, lucid, text }: @@ -174592,7 +177663,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-snap" = callPackage + "websockets-snap_0_9_2_0" = callPackage ({ mkDerivation, base, bytestring, enumerator, mtl, snap-core , snap-server, websockets }: @@ -174603,6 +177674,23 @@ self: { libraryHaskellDepends = [ base bytestring enumerator mtl snap-core snap-server websockets ]; + jailbreak = true; + description = "Snap integration for the websockets library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "websockets-snap" = callPackage + ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core + , snap-server, websockets + }: + mkDerivation { + pname = "websockets-snap"; + version = "0.10.0.0"; + sha256 = "092328966679e2f2761acc06ab4236297e61eff8a2e8087470b6962238daf4fe"; + libraryHaskellDepends = [ + base bytestring io-streams mtl snap-core snap-server websockets + ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -174766,8 +177854,8 @@ self: { }: mkDerivation { pname = "werewolf"; - version = "1.4.0.1"; - sha256 = "88e6d2d2fb6691dbec17b864d9431501238f64006556142e5f10d2ad94998e5f"; + version = "1.5.1.1"; + sha256 = "708166a9826dd212542beb06fe557adb47b1fcd1c222f313f3a6b3ba70434b68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174783,7 +177871,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "werewolf-slack" = callPackage + "werewolf-slack_1_0_1_4" = callPackage ({ mkDerivation, aeson, base, bytestring, extra, http-client , http-client-tls, http-types, mtl, optparse-applicative, process , text, wai, warp, werewolf @@ -174798,6 +177886,28 @@ self: { aeson base bytestring extra http-client http-client-tls http-types mtl optparse-applicative process text wai warp werewolf ]; + jailbreak = true; + homepage = "https://github.com/hjwylde/werewolf-slack"; + description = "A chat interface for playing werewolf in Slack"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "werewolf-slack" = callPackage + ({ mkDerivation, aeson, base, bytestring, extra, http-client + , http-client-tls, http-types, mtl, optparse-applicative, process + , text, wai, warp, werewolf + }: + mkDerivation { + pname = "werewolf-slack"; + version = "1.0.2.0"; + sha256 = "94d0194666dfe540bb38cef0204547e62c80b54686a49b1d5f48d1b1d431a495"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring extra http-client http-client-tls http-types + mtl optparse-applicative process text wai warp werewolf + ]; homepage = "https://github.com/hjwylde/werewolf-slack"; description = "A chat interface for playing werewolf in Slack"; license = stdenv.lib.licenses.bsd3; @@ -175406,11 +178516,10 @@ self: { ({ mkDerivation, base, hspec, vector }: mkDerivation { pname = "woot"; - version = "0.0.0.5"; - sha256 = "62f135f4c9e3c6c4e9e7efbbd299bd12649cea6be46771d0c1e7ef612cce664d"; + version = "0.0.0.6"; + sha256 = "4e7b4c12fe18a9e6d649dcd0ab4ea1910a340e3a4ebb1f341484beb359ce82b7"; libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base hspec ]; - jailbreak = true; + testHaskellDepends = [ base hspec vector ]; homepage = "https://github.com/TGOlson/woot-haskell"; description = "Real time group editor without operational transform"; license = stdenv.lib.licenses.mit; @@ -176257,6 +179366,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x86-64bit" = callPackage + ({ mkDerivation, base, monads-tf, QuickCheck, vector }: + mkDerivation { + pname = "x86-64bit"; + version = "0.1.4"; + sha256 = "bd6959ccc90bc6176eccf915e7c2af1ddc3febdfa84708413289357160e5821a"; + libraryHaskellDepends = [ base monads-tf QuickCheck vector ]; + testHaskellDepends = [ base monads-tf QuickCheck vector ]; + homepage = "https://github.com/divipp/x86-64"; + description = "Runtime code generation for x86 64 bit machine code"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xattr" = callPackage ({ mkDerivation, attr, base, bytestring, containers, directory , filepath, HUnit, test-framework, test-framework-hunit, unix @@ -176363,7 +179485,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "xdcc" = callPackage + "xdcc_1_0_4" = callPackage ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp , irc-dcc, lifted-base, network, optparse-applicative, path, random @@ -176384,6 +179506,30 @@ self: { homepage = "https://github.com/JanGe/xdcc"; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xdcc" = callPackage + ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive + , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp + , irc-dcc, lifted-base, network, optparse-applicative, path, random + , simpleirc, transformers, unix-compat + }: + mkDerivation { + pname = "xdcc"; + version = "1.0.6"; + sha256 = "2a28d2c3bd13647b605adb845bb2f377c9be502218d979a52f6ed653050fb1b8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ascii-progress base bytestring case-insensitive concurrent-extra + concurrent-output errors iproute irc-ctcp irc-dcc lifted-base + network optparse-applicative path random simpleirc transformers + unix-compat + ]; + homepage = "https://github.com/JanGe/xdcc"; + description = "A wget-like utility for retrieving files from XDCC bots on IRC"; + license = stdenv.lib.licenses.mit; }) {}; "xdg-basedir" = callPackage @@ -176708,7 +179854,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xlsx" = callPackage + "xlsx_0_2_3" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, extra, filepath, groom , lens, mtl, network-uri, old-locale, raw-strings-qq, safe @@ -176732,6 +179878,35 @@ self: { homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xlsx" = callPackage + ({ mkDerivation, base, base64-bytestring, binary-search, bytestring + , conduit, containers, data-default, Diff, errors, extra, filepath + , groom, lens, mtl, mtl-compat, network-uri, old-locale + , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xml-conduit + , zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.2.4"; + sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40"; + libraryHaskellDepends = [ + base base64-bytestring binary-search bytestring conduit containers + data-default errors extra filepath lens mtl mtl-compat network-uri + old-locale safe text time transformers vector xml-conduit + zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck time vector + xml-conduit + ]; + homepage = "https://github.com/qrilka/xlsx"; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; }) {}; "xlsx-tabular" = callPackage @@ -177315,7 +180490,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "xmlhtml" = callPackage + "xmlhtml_0_2_3_4" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, parsec, text, unordered-containers }: @@ -177331,6 +180506,32 @@ self: { ]; description = "XML parser and renderer with HTML 5 quirks mode"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "xmlhtml" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup + , bytestring, containers, directory, HUnit, parsec, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, unordered-containers + }: + mkDerivation { + pname = "xmlhtml"; + version = "0.2.3.5"; + sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d"; + libraryHaskellDepends = [ + base blaze-builder blaze-html blaze-markup bytestring containers + parsec text unordered-containers + ]; + testHaskellDepends = [ + base blaze-builder blaze-html blaze-markup bytestring containers + directory HUnit parsec QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + unordered-containers + ]; + homepage = "https://github.com/snapframework/xmlhtml"; + description = "XML parser and renderer with HTML 5 quirks mode"; + license = stdenv.lib.licenses.bsd3; }) {}; "xmltv" = callPackage @@ -177395,8 +180596,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.24.1"; - sha256 = "94b61be06a6c08d8f7dced28e4721acb231987710981ef9c438c60f3a133d985"; + version = "0.24.2"; + sha256 = "a8aa243ec8d86b88da2c072eeef4d09be00091254ad05eaf517756e20483cd64"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; @@ -178639,7 +181840,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "yesod-auth" = callPackage + "yesod-auth_1_4_13_3" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -178666,6 +181867,36 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, byteable, bytestring, conduit, conduit-extra + , containers, cryptohash, data-default, email-validate, file-embed + , http-client, http-conduit, http-types, lifted-base, mime-mail + , network-uri, nonce, persistent, persistent-template, random + , resourcet, safe, shakespeare, template-haskell, text, time + , transformers, unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.4.13.4"; + sha256 = "7ccdf087e79e3117ea594891d46798e0f87d8c975c7f846fac53891d778a874b"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup byteable bytestring conduit + conduit-extra containers cryptohash data-default email-validate + file-embed http-client http-conduit http-types lifted-base + mime-mail network-uri nonce persistent persistent-template random + resourcet safe shakespeare template-haskell text time transformers + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + homepage = "http://www.yesodweb.com/"; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-auth-account" = callPackage @@ -178795,7 +182026,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-auth-hashdb" = callPackage + "yesod-auth-hashdb_1_5_1_1" = callPackage ({ mkDerivation, base, basic-prelude, bytestring, containers , cryptohash, hspec, http-conduit, http-types, monad-logger , network-uri, persistent, persistent-sqlite, pwstore-fast @@ -178818,6 +182049,32 @@ self: { homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth-hashdb" = callPackage + ({ mkDerivation, base, basic-prelude, bytestring, containers + , cryptohash, hspec, http-conduit, http-types, monad-logger + , network-uri, persistent, persistent-sqlite, pwstore-fast + , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-hashdb"; + version = "1.5.1.2"; + sha256 = "95937003779f9024c65f960022dafcd125b28ae4de24b5b7be66b1dd9d4d5a66"; + libraryHaskellDepends = [ + base bytestring cryptohash persistent pwstore-fast text yesod-auth + yesod-core yesod-form yesod-persistent + ]; + testHaskellDepends = [ + base basic-prelude bytestring containers hspec http-conduit + http-types monad-logger network-uri persistent-sqlite resourcet + text wai-extra yesod yesod-auth yesod-core yesod-test + ]; + homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; + description = "Authentication plugin for Yesod"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-auth-kerberos" = callPackage @@ -179124,7 +182381,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core" = callPackage + "yesod-core_1_4_22" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -179162,6 +182419,47 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-core" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , blaze-html, blaze-markup, byteable, bytestring, case-insensitive + , cereal, clientsession, conduit, conduit-extra, containers, cookie + , data-default, deepseq, deepseq-generics, directory, exceptions + , fast-logger, hspec, hspec-expectations, http-types, HUnit + , lifted-base, monad-control, monad-logger, mtl, mwc-random + , network, old-locale, parsec, path-pieces, primitive, QuickCheck + , random, resourcet, safe, semigroups, shakespeare + , streaming-commons, template-haskell, text, time, transformers + , transformers-base, unix-compat, unordered-containers, vector, wai + , wai-extra, wai-logger, warp, word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.4.23"; + sha256 = "05aea0cf09ae9f568358d8443c702bf070f2f64759820e3b5d3ecb4e4f557e3c"; + libraryHaskellDepends = [ + aeson auto-update base blaze-builder blaze-html blaze-markup + byteable bytestring case-insensitive cereal clientsession conduit + conduit-extra containers cookie data-default deepseq + deepseq-generics directory exceptions fast-logger http-types + lifted-base monad-control monad-logger mtl mwc-random old-locale + parsec path-pieces primitive random resourcet safe semigroups + shakespeare template-haskell text time transformers + transformers-base unix-compat unordered-containers vector wai + wai-extra wai-logger warp word8 + ]; + testHaskellDepends = [ + async base blaze-builder bytestring clientsession conduit + conduit-extra containers cookie hspec hspec-expectations http-types + HUnit lifted-base mwc-random network path-pieces QuickCheck random + resourcet shakespeare streaming-commons template-haskell text + transformers wai wai-extra + ]; + homepage = "http://www.yesodweb.com/"; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-crud" = callPackage @@ -179676,7 +182974,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "yesod-persistent" = callPackage + "yesod-persistent_1_4_0_5" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet , text, transformers, wai-extra, yesod-core @@ -179696,6 +182994,29 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-persistent" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.4.0.6"; + sha256 = "69c1261b49a6448795d569431691115fc6b86f7b296905573f5b2271465dee71"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + homepage = "http://www.yesodweb.com/"; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-platform" = callPackage @@ -180172,7 +183493,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "yesod-test" = callPackage + "yesod-test_1_5_1_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base @@ -180196,6 +183517,34 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-test" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, case-insensitive, containers, cookie + , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base + , monad-control, network, persistent, pretty-show, text, time + , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core + , yesod-form + }: + mkDerivation { + pname = "yesod-test"; + version = "1.5.2"; + sha256 = "e0faf315423fb5043c68c639e0e604b6426143d490cbdf3396238dccae5ef174"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + case-insensitive containers cookie hspec-core html-conduit + http-types HUnit monad-control network persistent pretty-show text + time transformers wai wai-extra xml-conduit xml-types yesod-core + ]; + testHaskellDepends = [ + base bytestring containers hspec html-conduit http-types HUnit + lifted-base text wai xml-conduit yesod-core yesod-form + ]; + homepage = "http://www.yesodweb.com"; + description = "integration testing for WAI/Yesod Applications"; + license = stdenv.lib.licenses.mit; }) {}; "yesod-test-json" = callPackage @@ -180936,6 +184285,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "zabt" = callPackage + ({ mkDerivation, base, containers, tasty, tasty-hspec }: + mkDerivation { + pname = "zabt"; + version = "0.4.0.0"; + sha256 = "397da26f87e37d53729a1dc8dfeacbfc146b097a8a50238369c09a13109ffa2b"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + homepage = "https://github.com/tel/hs-zabt#readme"; + description = "Simple-minded abstract binding trees"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zalgo" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -181707,15 +185069,27 @@ self: { pname = "ztail"; version = "1.2"; sha256 = "13b314c992597118de1bfe0b866ef061237910f77bd35fb258e42d21182a3a4f"; + revision = "1"; + editedCabalFile = "73528314fa829b0d5b28ce78cb365a1f91c506ac43fa28f2a61d0fed3dace142"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base bytestring filepath hinotify process regex-posix time unix unordered-containers ]; - jailbreak = true; description = "Multi-file, colored, filtered log tailer"; license = stdenv.lib.licenses.bsd3; }) {}; + "zxcvbn-c" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zxcvbn-c"; + version = "1.0.0"; + sha256 = "9db674641107eccc606f26b3a2163657ab4335e1b0c65f00d5ddf23f9bfb1a03"; + libraryHaskellDepends = [ base ]; + description = "Password strength estimation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + } diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index fc3070e55f1..1824287c823 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { b=$(basename $f) if [ $b == "mix" ]; then continue; fi wrapProgram $f \ - --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils curl bash ]}" \ --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index c49b479d6f5..02f9d1f98e8 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index cb29341689d..56b4626a212 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix index 34896046e31..5d9c5dac3d8 100644 --- a/pkgs/development/interpreters/erlang/R18.nix +++ b/pkgs/development/interpreters/erlang/R18.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 8eac077a110..1cd68221fa7 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { # Some erlang bin/ scripts run sed and awk postFixup = '' wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/" - wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin" + wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnused gawk ]}" ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/interpreters/lfe/default.nix b/pkgs/development/interpreters/lfe/default.nix index f3a54aef8ab..c7957275f9e 100644 --- a/pkgs/development/interpreters/lfe/default.nix +++ b/pkgs/development/interpreters/lfe/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # Add some stuff to PATH so the scripts can run without problems. for f in $out/bin/*; do wrapProgram $f \ - --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${bash}/bin:$out/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ erlang coreutils bash ]}:$out/bin" substituteInPlace $f --replace "/usr/bin/env" "${coreutils}/bin/env" done ''; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 76b08cd35c6..8053c82e90e 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; NIX_CFLAGS_COMPILE = '' - -I${SDL}/include/SDL + -I${SDL.dev}/include/SDL -I${freetype.dev}include/freetype2 ''; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index e7d8bf1bc05..c3da770a6e1 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -3,7 +3,7 @@ variant ? "jit", buildWithPypy ? false }: let - commit-count = "1352"; + commit-count = "1356"; common-flags = "--thread --gcrootfinder=shadowstack --continuation"; variants = { jit = { flags = "--opt=jit"; target = "target.py"; }; @@ -13,14 +13,14 @@ let }; pixie-src = fetchgit { url = "https://github.com/pixie-lang/pixie.git"; - rev = "dd754fe9f329e9e176eeaedae1095c85cde65028"; - sha256 = "1jf3nkd1jzvxrw9ql2r74drsirrxfihc125x0wmk45jyl5q24vdd"; + rev = "d2a4267ea088f711af36a74928e8dfd8360584ad"; + sha256 = "1asf6yx7zy9cx4bsg8iai57dy3r3m45xcmkmw2vix70xvfy23ryf"; }; - pypy-tag = "81254"; + pypy-tag = "91db1a9"; pypy-src = fetchurl { name = "pypy-src-${pypy-tag}"; url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2"; - sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn"; + sha256 = "0ylbqvhbcp5m09l15i2q2h3a0vjd055x2r37cq71lkhgmmaxrwbq"; }; libs = [ libffi libedit libuv boost.dev boost.out zlib ]; include-path = stdenv.lib.concatStringsSep ":" @@ -63,11 +63,17 @@ let mkdir -p $out/share $out/bin cp pixie-src/pixie-vm $out/share/pixie-vm cp -R pixie-src/pixie $out/share/pixie - makeWrapper $out/share/pixie-vm $out/bin/pxi \ + makeWrapper $out/share/pixie-vm $out/bin/pixie-vm \ --prefix LD_LIBRARY_PATH : ${library-path} \ --prefix C_INCLUDE_PATH : ${include-path} \ --prefix LIBRARY_PATH : ${library-path} \ --prefix PATH : ${bin-path} + cat > $out/bin/pxi <<EOF + #!$shell + >&2 echo "[\$\$] WARNING: 'pxi' is a deprecated alias for 'pixie-vm', please update your scripts." + exec $out/bin/pixie-vm "\$@" + EOF + chmod +x $out/bin/pxi ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 1aea9f44039..34b47113193 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pixie ]; patches = [ ./make-paths-configurable.patch ]; configurePhase = '' - pixiePath="${pixie}/bin/pxi" \ + pixiePath="${pixie}/bin/pixie-vm" \ basePath="$out/share/dust" \ substituteAll dust.in dust chmod +x dust diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index ba6f5706bbd..2e54e953e67 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -6,7 +6,7 @@ assert zlibSupport -> zlib != null; let - majorVersion = "5.1.1"; + majorVersion = "5.3.1"; version = "${majorVersion}"; libPrefix = "pypy${majorVersion}"; @@ -17,8 +17,8 @@ let inherit majorVersion version; src = fetchurl { - url = "https://bitbucket.org/pypy/pypy/get/release-${version}.tar.bz2"; - sha256 = "1dmckvffanmh0b50pq34shnw05r55gjxn43kgvnkz5kkvvsbxdg1"; + url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; + sha256 = "19cq2ngkh5q5jxwhw81rd6p0qna73z85jfik88w0856k5aj86yha"; }; # http://bugs.python.org/issue27369 diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 355723ba337..dd735876435 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, python, cython, pkgconfig, wrapPython -, pygame, SDL, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib +{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL +, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib }: +with pythonPackages; + stdenv.mkDerivation { name = "renpy-6.17.6"; diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 6c3920ff8aa..ca0bbd6a01c 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap -, openglSupport ? false, mesa ? null -, alsaSupport ? true, alsaLib ? null -, x11Support ? true, xlibsWrapper ? null, libXrandr ? null -, pulseaudioSupport ? true, libpulseaudio ? null +, openglSupport ? false, mesa_noglu +, alsaSupport ? true, alsaLib +, x11Support ? true, libXext, libICE, libXrandr +, pulseaudioSupport ? true, libpulseaudio , OpenGL, CoreAudio, CoreServices, AudioUnit, Kernel, Cocoa }: @@ -10,17 +10,12 @@ # PulseAudio. assert (stdenv.isLinux && !(stdenv ? cross)) -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (mesa != null && x11Support); -assert x11Support -> (xlibsWrapper != null && libXrandr != null); -assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> libpulseaudio != null; - let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.2.15"; name = "SDL-${version}"; + version = "1.2.15"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; @@ -34,10 +29,10 @@ stdenv.mkDerivation rec { # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. propagatedBuildInputs = - optionals x11Support [ xlibsWrapper libXrandr ] ++ + optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optional openglSupport mesa ++ + optional openglSupport mesa_noglu ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; @@ -57,9 +52,9 @@ stdenv.mkDerivation rec { "--enable-rpath" "--disable-pulseaudio-shared" "--disable-osmesa-shared" - ] ++ stdenv.lib.optionals (stdenv ? cross) ([ + ] ++ optionals (stdenv ? cross) ([ "--without-x" - ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); + ] ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"); patches = [ # Fix window resizing issues, e.g. for xmonad @@ -95,15 +90,18 @@ stdenv.mkDerivation rec { url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87"; sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv"; }) + ./find-headers.patch ]; postFixup = ''moveToOutput share/aclocal "$dev" ''; + setupHook = ./setup-hook.sh; + passthru = { inherit openglSupport; }; meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = http://www.libsdl.org/; + homepage = "http://www.libsdl.org/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/SDL/find-headers.patch b/pkgs/development/libraries/SDL/find-headers.patch new file mode 100644 index 00000000000..5f75ae9e830 --- /dev/null +++ b/pkgs/development/libraries/SDL/find-headers.patch @@ -0,0 +1,16 @@ +diff -ru3 SDL-1.2.15/sdl-config.in SDL-1.2.15-new/sdl-config.in +--- SDL-1.2.15/sdl-config.in 2012-01-19 10:30:06.000000000 +0400 ++++ SDL-1.2.15-new/sdl-config.in 2016-08-22 05:32:52.716397920 +0300 +@@ -42,7 +42,11 @@ + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL @SDL_CFLAGS@ ++ SDL_CFLAGS="" ++ for i in @includedir@/SDL $SDL_PATH; do ++ SDL_CFLAGS="$SDL_CFLAGS -I$i" ++ done ++ echo $SDL_CFLAGS @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/development/libraries/SDL/setup-hook.sh b/pkgs/development/libraries/SDL/setup-hook.sh new file mode 100644 index 00000000000..3696e743a07 --- /dev/null +++ b/pkgs/development/libraries/SDL/setup-hook.sh @@ -0,0 +1,11 @@ +addSDLPath () { + if [ -e "$1/include/SDL" ]; then + export SDL_PATH="$SDL_PATH $1/include/SDL" + fi +} + +if test -n "$crossConfig"; then + crossEnvHooks+=(addSDLPath) +else + envHooks+=(addSDLPath) +fi diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 1c260c2ba91..16aa4f6c2f7 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, audiofile -, openglSupport ? false, mesa ? null -, alsaSupport ? true, alsaLib ? null -, x11Support ? true, xlibsWrapper ? null, libXrandr ? null -, pulseaudioSupport ? true, libpulseaudio ? null +{ stdenv, lib, fetchurl, pkgconfig, audiofile +, openglSupport ? false, mesa_noglu +, alsaSupport ? true, alsaLib +, x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr +, dbusSupport ? false, dbus +, udevSupport ? false, udev +, ibusSupport ? false, ibus +, pulseaudioSupport ? true, libpulseaudio , AudioUnit, Cocoa, CoreAudio, CoreServices, ForceFeedback, OpenGL }: @@ -10,35 +13,39 @@ # PulseAudio. assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || mesa != null && x11Support); -assert x11Support -> (xlibsWrapper != null && libXrandr != null); -assert alsaSupport -> alsaLib != null; -assert pulseaudioSupport -> libpulseaudio != null; +assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support); let - configureFlagsFun = attrs: '' - --disable-oss --disable-x11-shared - --disable-pulseaudio-shared --disable-alsa-shared - ${if alsaSupport then "--with-alsa-prefix=${attrs.alsaLib.out}/lib" else ""} - ${if (!x11Support) then "--without-x" else ""} - ''; + configureFlagsFun = attrs: [ + "--disable-oss" "--disable-x11-shared" + "--disable-pulseaudio-shared" "--disable-alsa-shared" + ] ++ lib.optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib" + ++ lib.optional (!x11Support) "--without-x"; in stdenv.mkDerivation rec { - name = "SDL2-2.0.3"; + name = "SDL2-${version}"; + version = "2.0.4"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0369ngvb46x6c26h8zva4x22ywgy6mvn0wx87xqwxg40pxm9m9m5"; + sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"; }; + patches = [ ./find-headers.patch ]; + + nativeBuildInputs = [ pkgconfig ]; + # Since `libpulse*.la' contain `-lgdbm', PulseAudio must be propagated. - propagatedBuildInputs = stdenv.lib.optionals x11Support [ xlibsWrapper libXrandr ] ++ - stdenv.lib.optional pulseaudioSupport libpulseaudio; + propagatedBuildInputs = lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] ++ + lib.optional pulseaudioSupport libpulseaudio; - buildInputs = [ pkgconfig audiofile ] ++ - stdenv.lib.optional openglSupport mesa ++ - stdenv.lib.optional alsaSupport alsaLib ++ - stdenv.lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + buildInputs = [ audiofile ] ++ + lib.optional openglSupport mesa_noglu ++ + lib.optional alsaSupport alsaLib ++ + lib.optional dbusSupport dbus ++ + lib.optional udevSupport udev ++ + lib.optional ibusSupport ibus ++ + lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 dontDisableStatic = true; @@ -49,20 +56,22 @@ stdenv.mkDerivation rec { configureFlags = configureFlagsFun { inherit alsaLib; }; crossAttrs = { - configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; + configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; }; }; postInstall = '' rm $out/lib/*.a ''; - passthru = {inherit openglSupport;}; + setupHook = ./setup-hook.sh; + + passthru = { inherit openglSupport; }; - meta = { + meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = http://www.libsdl.org/; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.page ]; + homepage = "http://www.libsdl.org/"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ page ]; }; } diff --git a/pkgs/development/libraries/SDL2/find-headers.patch b/pkgs/development/libraries/SDL2/find-headers.patch new file mode 100644 index 00000000000..a6114901055 --- /dev/null +++ b/pkgs/development/libraries/SDL2/find-headers.patch @@ -0,0 +1,26 @@ +diff -ru3 SDL2-2.0.4/sdl2-config.cmake.in SDL2-2.0.4-new/sdl2-config.cmake.in +--- SDL2-2.0.4/sdl2-config.cmake.in 2016-01-02 22:56:31.000000000 +0300 ++++ SDL2-2.0.4-new/sdl2-config.cmake.in 2016-08-22 05:26:42.420397323 +0300 +@@ -6,5 +6,5 @@ + set(SDL2_PREFIX "@prefix@") + set(SDL2_EXEC_PREFIX "@prefix@") + set(SDL2_LIBDIR "@libdir@") +-set(SDL2_INCLUDE_DIRS "@includedir@/SDL2") ++set(SDL2_INCLUDE_DIRS "@includedir@/SDL2" $ENV{SDL2_PATH}) + set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@") +diff -ru3 SDL2-2.0.4/sdl2-config.in SDL2-2.0.4-new/sdl2-config.in +--- SDL2-2.0.4/sdl2-config.in 2016-01-02 22:56:31.000000000 +0300 ++++ SDL2-2.0.4-new/sdl2-config.in 2016-08-22 05:32:02.256397839 +0300 +@@ -42,7 +42,11 @@ + echo @SDL_VERSION@ + ;; + --cflags) +- echo -I@includedir@/SDL2 @SDL_CFLAGS@ ++ SDL_CFLAGS="" ++ for i in @includedir@/SDL2 $SDL2_PATH; do ++ SDL_CFLAGS="$SDL_CFLAGS -I$i" ++ done ++ echo $SDL_CFLAGS @SDL_CFLAGS@ + ;; + @ENABLE_SHARED_TRUE@ --libs) + @ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ diff --git a/pkgs/development/libraries/SDL2/setup-hook.sh b/pkgs/development/libraries/SDL2/setup-hook.sh new file mode 100644 index 00000000000..5a26440f37b --- /dev/null +++ b/pkgs/development/libraries/SDL2/setup-hook.sh @@ -0,0 +1,11 @@ +addSDL2Path () { + if [ -e "$1/include/SDL2" ]; then + export SDL2_PATH="$SDL2_PATH $1/include/SDL2" + fi +} + +if test -n "$crossConfig"; then + crossEnvHooks+=(addSDL2Path) +else + envHooks+=(addSDL2Path) +fi diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index 23a0924ad3b..1d26fed805e 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -1,30 +1,19 @@ -{stdenv, fetchsvn, SDL2}: +{ stdenv, fetchurl, SDL2 }: -let rev = 5; in stdenv.mkDerivation rec { - name = "SDL2_gfx-${toString rev}"; + name = "SDL2_gfx-${version}"; + version = "1.0.1"; - src = fetchsvn { - url = http://svn.code.sf.net/p/sdl2gfx/code/trunk; - inherit rev; - sha256 = "1hzilbn1412m2b44mygrbdfh1gvks4v5p0kmafz248jf9ifsvmzp"; + src = fetchurl { + url = "mirror://sourceforge/sdl2gfx/${name}.tar.gz"; + sha256 = "16jrijzdp095qf416zvj9gs2fqqn6zkyvlxs5xqybd0ip37cp6yn"; }; - buildInputs = [ SDL2 ] ; + buildInputs = [ SDL2 ]; - configureFlags = "--disable-mmx"; + configureFlags = [ "--enable-mmx" ]; - postInstall = '' - sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \ - $out/include/SDL2/*.h - - ln -s $out/include/SDL2/SDL2_framerate.h $out/include/SDL2/SDL_framerate.h; - ln -s $out/include/SDL2/SDL2_gfxPrimitives.h $out/include/SDL2/SDL_gfxPrimitives.h; - ln -s $out/include/SDL2/SDL2_rotozoom.h $out/include/SDL2/SDL_rotozoom.h; - ln -s $out/include/SDL2/*.h $out/include/; - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = '' @@ -45,10 +34,10 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; - license = stdenv.lib.licenses.lgpl2Plus; + homepage = "https://sourceforge.net/projects/sdlgfx/"; + license = licenses.zlib; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ bjg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 7253fc7b4da..22282e1a10c 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -1,27 +1,20 @@ { stdenv, fetchurl, SDL2, libpng, libjpeg, libtiff, libungif, libXpm, zlib }: stdenv.mkDerivation rec { - name = "SDL2_image-2.0.1"; + name = "SDL2_image-${version}"; + version = "2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; sha256 = "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis"; }; - buildInputs = [SDL2 libpng libjpeg libtiff libungif libXpm zlib]; + buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]; - postInstall = '' - sed -i -e 's,"SDL.h",<SDL2/SDL.h>,' \ - -e 's,"SDL_version.h",<SDL2/SDL_version.h>,' \ - -e 's,"begin_code.h",<SDL2/begin_code.h>,' \ - -e 's,"close_code.h",<SDL2/close_code.h>,' \ - $out/include/SDL2/SDL_image.h - ln -sv SDL2/SDL_image.h $out/include/SDL_image.h - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL image library"; homepage = "http://www.libsdl.org/projects/SDL_image/"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 1a7ce841d0c..0919970543c 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -1,21 +1,22 @@ -{ stdenv, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: +{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }: stdenv.mkDerivation rec { - name = "SDL2_mixer-2.0.1"; + name = "SDL2_mixer-${version}"; + version = "2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_mixer/release/${name}.tar.gz"; sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"; }; - propagatedBuildInputs = [SDL2 libogg libvorbis]; + propagatedBuildInputs = [ SDL2 libogg libvorbis ]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi "--enable-music-native-midi-gpl"; + configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"; - postInstall = "ln -s $out/include/SDL2/SDL_mixer.h $out/include/"; - - meta = { + meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + homepage = "https://www.libsdl.org/projects/SDL_mixer/"; + license = licenses.zlib; }; } diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 6f096577819..15a3305c7f4 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl, SDL2 }: stdenv.mkDerivation rec { - name = "SDL2_net-2.0.0"; + name = "SDL2_net-${version}"; + version = "2.0.1"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; - sha256 = "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab"; + sha256 = "08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm"; }; - propagatedBuildInputs = [SDL2]; - - postInstall = "ln -s $out/include/SDL2/SDL_net.h $out/include/"; + propagatedBuildInputs = [ SDL2 ]; meta = with stdenv.lib; { description = "SDL multiplatform networking library"; - homepage = https://www.libsdl.org/projects/SDL_net; + homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; - maintainers = [ maintainers.MP2E ]; + maintainers = with maintainers; [ MP2E ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 84944c0aa66..71aeecb3a80 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, SDL2, freetype }: +{ stdenv, fetchurl, SDL2, freetype, mesa_noglu }: stdenv.mkDerivation rec { - name = "SDL2_ttf-2.0.14"; + name = "SDL2_ttf-${version}"; + version = "2.0.14"; src = fetchurl { url = "https://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz"; sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [SDL2 freetype]; + buildInputs = [ SDL2 freetype mesa_noglu ]; - postInstall = "ln -s $out/include/SDL2/SDL_ttf.h $out/include/"; - - meta = { + meta = with stdenv.lib; { description = "SDL TrueType library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; }; } diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 7bff348b754..ff8c081af93 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, SDL} : +{ stdenv, fetchurl, SDL }: stdenv.mkDerivation rec { - name = "SDL_gfx-2.0.25"; + name = "SDL_gfx-${version}"; + version = "2.0.25"; src = fetchurl { url = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/${name}.tar.gz"; @@ -10,16 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL ] ; - configureFlags = "--disable-mmx"; + configureFlags = [ "--disable-mmx" ]; - postInstall = '' - sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \ - $out/include/SDL/*.h - - ln -s $out/include/SDL/*.h $out/include/; - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL graphics drawing primitives and support functions"; longDescription = @@ -40,10 +34,10 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; - license = stdenv.lib.licenses.lgpl2Plus; + homepage = "https://sourceforge.net/projects/sdlgfx/"; + license = licenses.zlib; - maintainers = [ stdenv.lib.maintainers.bjg ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ bjg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index a1d83950477..62af47807cc 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }: stdenv.mkDerivation rec { - name = "SDL_image-1.2.12"; + name = "SDL_image-${version}"; + version = "1.2.12"; src = fetchurl { url = "http://www.libsdl.org/projects/SDL_image/release/${name}.tar.gz"; @@ -10,18 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libpng libjpeg libtiff libungif libXpm ]; - postInstall = '' - sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \ - -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \ - -e 's,"begin_code.h",<SDL/begin_code.h>,' \ - -e 's,"close_code.h",<SDL/close_code.h>,' \ - $out/include/SDL/SDL_image.h - ln -sv SDL/SDL_image.h $out/include/SDL_image.h - ''; - meta = with stdenv.lib; { description = "SDL image library"; - homepage = http://www.libsdl.org/projects/SDL_image/; + homepage = "http://www.libsdl.org/projects/SDL_image/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 22a67b13e0b..d3d57947464 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: +{ stdenv, lib, fetchurl, SDL, libogg, libvorbis, smpeg, enableNativeMidi ? false, fluidsynth ? null }: stdenv.mkDerivation rec { pname = "SDL_mixer"; @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"; }; - buildInputs = [SDL libogg libvorbis fluidsynth smpeg]; + buildInputs = [ SDL libogg libvorbis fluidsynth smpeg ]; - configureFlags = "--disable-music-ogg-shared" + stdenv.lib.optionalString enableNativeMidi " --enable-music-native-midi-gpl"; - - postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/"; + configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi " --enable-music-native-midi-gpl"; meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 045ad8925d9..b151d0ee83e 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -11,21 +11,12 @@ stdenv.mkDerivation rec { sha256 = "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"; }; - propagatedBuildInputs = [SDL]; + propagatedBuildInputs = [ SDL ]; - postInstall = '' - sed -i -e 's,"SDL.h",<SDL/SDL.h>,' \ - -e 's,"SDL_endian.h",<SDL/SDL_endian.h>,' \ - -e 's,"SDL_version.h",<SDL/SDL_version.h>,' \ - -e 's,"begin_code.h",<SDL/begin_code.h>,' \ - -e 's,"close_code.h",<SDL/close_code.h>,' \ - $out/include/SDL/SDL_net.h - - ln -sv $out/include/SDL/SDL_net.h $out/include/ - ''; - - meta = { + meta = with stdenv.lib; { description = "SDL networking library"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.zlib; + homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; }; } diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 5ca64730f51..8d088b6bbf4 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -1,7 +1,8 @@ -{stdenv, fetchurl, SDL, libvorbis, flac, libmikmod}: +{ stdenv, fetchurl, SDL, libvorbis, flac, libmikmod }: stdenv.mkDerivation rec { - name = "SDL_sound-1.0.3"; + name = "SDL_sound-${version}"; + version = "1.0.3"; src = fetchurl { url = "http://icculus.org/SDL_sound/downloads/${name}.tar.gz"; @@ -10,10 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libvorbis flac libmikmod ]; - postInstall = "ln -s $out/include/SDL/SDL_sound.h $out/include/"; - - meta = { + meta = with stdenv.lib; { description = "SDL sound library"; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + license = licenses.lgpl21; + homepage = "https://www.icculus.org/SDL_sound/"; }; } diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 52c43da9d16..2a4ddac524c 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -1,19 +1,20 @@ { stdenv, fetchurl, SDL }: -stdenv.mkDerivation { - name = "SDL_stretch-0.3.1"; +stdenv.mkDerivation rec { + name = "SDL_stretch-${version}"; + version = "0.3.1"; src = fetchurl { - url = "mirror://sourceforge/sdl-stretch/0.3.1/SDL_stretch-0.3.1.tar.bz2"; + url = "mirror://sourceforge/sdl-stretch/${version}/${name}.tar.bz2"; sha256 = "1mzw68sn4yxbp8429jg2h23h8xw2qjid51z1f5pdsghcn3x0pgvw"; }; buildInputs = [ SDL ]; - meta = { + meta = with stdenv.lib; { description = "Stretch Functions For SDL"; homepage = "http://sdl-stretch.sourceforge.net/"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.linux; + license = licenses.lgpl2; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 04938868d10..c71dced918a 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "apache-activemq-${version}"; - version = "5.13.2"; + version = "5.13.4"; src = fetchurl { - sha256 = "0vrgny8fw973xvr3w4wc1s44z50b0c2hgcqa91s8fbx2yjmqn5xy"; + sha256 = "0sp806bmv9vs19zbzlv71ag09p1jbl2wn2wpxfwa20mndri8lsmz"; url = "mirror://apache/activemq/${version}/${name}-bin.tar.gz"; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index e6051552ab7..8450def0845 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation rec { - name = "appstream-glib-0.5.11"; + name = "appstream-glib-0.5.12"; src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "1rvfncm9z29h70pd718j73cd263g6yyxkxrg7zfzy0gj6wwzvhkh"; + sha256 = "00b0441f409vzgy0znn42k093w7hwv3495qvsakxnhvk1h1ws23s"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 937275b6528..62b5ddf8011 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }: stdenv.mkDerivation rec { version = "7.200.2"; @@ -9,12 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; }; - buildInputs = [ cmake openblasCompat superlu hdf5 ]; + buildInputs = [ cmake openblasCompat superlu hdf5-cpp ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; - patches = [ ./use-unix-config-on-OS-X.patch - ./use-OpenBLAS-as-LAPACK.patch ]; + patches = [ ./use-unix-config-on-OS-X.patch ]; meta = with stdenv.lib; { description = "C++ linear algebra library"; diff --git a/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch b/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch deleted file mode 100644 index e4c77d2cc2e..00000000000 --- a/pkgs/development/libraries/armadillo/use-OpenBLAS-as-LAPACK.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/cmake_aux/Modules/ARMA_FindLAPACK.cmake b/cmake_aux/Modules/ARMA_FindLAPACK.cmake -index 5395afb..a203c93 100644 ---- a/cmake_aux/Modules/ARMA_FindLAPACK.cmake -+++ b/cmake_aux/Modules/ARMA_FindLAPACK.cmake -@@ -5,7 +5,7 @@ - # also defined, but not for general use are - # LAPACK_LIBRARY, where to find the LAPACK library. - --SET(LAPACK_NAMES ${LAPACK_NAMES} lapack) -+SET(LAPACK_NAMES ${LAPACK_NAMES} openblas) - FIND_LIBRARY(LAPACK_LIBRARY - NAMES ${LAPACK_NAMES} - PATHS /usr/lib64/atlas /usr/lib/atlas /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib - diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index f6f0a0d3af7..1f38f69eb0c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, libiconv, libintlOrEmpty , expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { sha256 = "0lmjlzmghmr27y615px9hkm552x7ap6pmq9mfbzr6smp8y2b6g31"; }; + infinality = fetchFromGitHub { + owner = "bohoomil"; + repo = "fontconfig-ultimate"; + rev = "730f5e77580677e86522c1f2119aa78803741759"; + sha256 = "1hbrdpm6xcczs2c2iid7by8h7dsd0jcf7an88s150njyqnjzxjg7"; + }; + + prePatch = '' + patches="$patches $(echo $infinality/*_cairo-iu/*.patch)" + ''; + outputs = [ "dev" "out" "docdev" ]; outputBin = "dev"; # very small diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 62563cfb968..9da83ca913e 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cppzmq-${version}"; - version = "2016-01-20"; + version = "2016-07-18"; src = fetchFromGitHub { owner = "zeromq"; repo = "cppzmq"; - rev = "68a7b09cfce01c4c279fba2cf91686fcfc566848"; - sha256 = "00dsqqlm8mxhm8kfdspxfln0wzwkyywscnf264afw02k6xf28ndm"; + rev = "92d2af6def80a01b76d5e73f073c439ad00ab757"; + sha256 = "0lnwh314hh5ifad2sa2nz1g1ld1jc4vplm7clyvx304sjjvbvl27"; }; installPhase = '' diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix new file mode 100644 index 00000000000..8be68a314e3 --- /dev/null +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "cxx-prettyprint-unstable-${version}"; + version = "2016-04-30"; + rev = "9ab26d228f2960f50b38ad37fe0159b7381f7533"; + + src = fetchFromGitHub { + owner = "louisdx"; + repo = "cxx-prettyprint"; + inherit rev; + sha256 = "1bp25yw8fb0mi432f72ihfxfj887gi36b36fpv677gawm786l7p1"; + }; + + installPhase = '' + mkdir -p "$out/include" + cp prettyprint.hpp "$out/include" + ''; + + meta = with stdenv.lib; { + description = "Header only C++ library for pretty printing standard containers"; + homepage = https://github.com/louisdx/cxx-prettyprint; + license = stdenv.lib.licenses.boost; + platforms = platforms.all; + + # This is a header-only library, no point in hydra building it: + hydraPlatforms = []; + }; +} diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix new file mode 100644 index 00000000000..c677ae6d867 --- /dev/null +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "2.2.1"; + name = "cxxtools"; + + src = fetchurl { + url = "http://www.tntnet.org/download/${name}-${version}.tar.gz"; + sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc"; + }; + + enableParallelBuilding = true; + + meta = { + homepage = "http://www.tntnet.org/cxxtools.html"; + description = "Comprehensive C++ class library for Unix and Linux"; + platforms = stdenv.lib.platforms.linux ; + license = stdenv.lib.licenses.lgpl21; + maintainers = [ stdenv.lib.maintainers.juliendehos ]; + }; +} diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 5e2081e750d..69b64629bd8 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -1,15 +1,17 @@ { stdenv, fetchurl, zeromq }: stdenv.mkDerivation rec { - baseName="czmq"; - version="3.0.2"; - name="${baseName}-${version}"; + version = "3.0.2"; + name = "czmq-${version}"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; sha256 = "16k9awrhdsymx7dnmvqcnkaq8lz8x8zppy6sh7ls8prpd6mkkjlb"; }; + # Fix build on Glibc 2.24. + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + # Needs to be propagated for the .pc file to work propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index 6b92848fd0f..68d1e62244c 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation rec { # all x86_64 have sse2 # however, not all float sizes fit ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" - ++ optional stdenv.cc.isGNU "--enable-openmp"; + ++ optional stdenv.cc.isGNU "--enable-openmp" + # doc generation causes Fortran wrapper generation which hard-codes gcc + ++ optional (!stdenv.cc.isGNU) "--disable-doc"; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index dc07c481b10..f4ab12e3c7f 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, boost, libevent, double_conversion, glog -, google-gflags, python, libiberty, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, boost, libevent +, double_conversion, glog, google-gflags, python, libiberty, openssl }: stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2016-04-29"; + version = "2016.08.08.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; - rev = "b31eb722e444ab0293a73fe9de3f94e657ca6de9"; - sha256 = "0s95y0wnz4xbrkzbiksnb0n0d0qrkcsbssznng57kwlq8jlfka24"; + rev = "v${version}"; + sha256 = "0f9xdi8w2mbn6gxjfvpzh8i22ca8p11a2ss6qkw31yhdgd3s9087"; }; - nativeBuildInputs = [ autoreconfHook python ]; + nativeBuildInputs = [ autoreconfHook python pkgconfig ]; buildInputs = [ libiberty boost libevent double_conversion glog google-gflags openssl ]; postPatch = "cd folly"; diff --git a/pkgs/development/libraries/fontconfig-ultimate/confd.nix b/pkgs/development/libraries/fontconfig-ultimate/confd.nix deleted file mode 100644 index 160fef5f07e..00000000000 --- a/pkgs/development/libraries/fontconfig-ultimate/confd.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -let version = "2015-12-06"; in -stdenv.mkDerivation { - name = "fontconfig-ultimate-${version}"; - - src = fetchFromGitHub { - sha256 = "02a811szxkq4q088nxfpdzp6rv0brvgkdhwigk09qffygxd776g6"; - rev = version; - repo = "fontconfig-ultimate"; - owner = "bohoomil"; - }; - - phases = "$prePhases unpackPhase installPhase $postPhases"; - - installPhase = '' - mkdir -p $out/etc/fonts/conf.d - cp conf.d.infinality/*.conf $out/etc/fonts/conf.d - - # Base rendering settings will be determined by NixOS module - rm $out/etc/fonts/conf.d/10-base-rendering.conf - - # Options controlled by NixOS module - rm $out/etc/fonts/conf.d/35-repl-custom.conf - rm $out/etc/fonts/conf.d/38-repl-*.conf - rm $out/etc/fonts/conf.d/82-*.conf - rm $out/etc/fonts/conf.d/83-*.conf - - # Inclusion of local and user configs handled by global configuration - rm $out/etc/fonts/conf.d/29-local.conf - rm $out/etc/fonts/conf.d/28-user.conf - - cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d - - mkdir -p $out/etc/fonts/presets/{combi,free,ms} - cp fontconfig_patches/combi/*.conf $out/etc/fonts/presets/combi - cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free - cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms - ''; -} diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix index aa799d850d7..efef59cad3b 100644 --- a/pkgs/development/libraries/fontconfig-ultimate/default.nix +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -1,6 +1,43 @@ -{ callPackage }: +{ stdenv, fetchFromGitHub }: -{ - confd = callPackage ./confd.nix {}; - rendering = callPackage ./rendering.nix {}; +let version = "2016-04-23"; in +stdenv.mkDerivation { + name = "fontconfig-ultimate-${version}"; + + src = fetchFromGitHub { + sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498"; + rev = version; + repo = "fontconfig-ultimate"; + owner = "bohoomil"; + }; + + phases = "$prePhases unpackPhase installPhase $postPhases"; + + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + cp conf.d.infinality/*.conf $out/etc/fonts/conf.d + + # Base rendering settings will be determined by NixOS module + rm $out/etc/fonts/conf.d/10-base-rendering.conf + + # Options controlled by NixOS module + rm $out/etc/fonts/conf.d/35-repl-custom.conf + rm $out/etc/fonts/conf.d/38-repl-*.conf + rm $out/etc/fonts/conf.d/82-*.conf + rm $out/etc/fonts/conf.d/83-*.conf + + # Inclusion of local and user configs handled by global configuration + rm $out/etc/fonts/conf.d/29-local.conf + rm $out/etc/fonts/conf.d/28-user.conf + + cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d + + # fix font priority issue https://github.com/bohoomil/fontconfig-ultimate/issues/173 + mv $out/etc/fonts/conf.d/{43,60}-wqy-zenhei-sharp.conf + + mkdir -p $out/etc/fonts/presets/{combi,free,ms} + cp fontconfig_patches/combi/*.conf $out/etc/fonts/presets/combi + cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free + cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms + ''; } diff --git a/pkgs/development/libraries/fontconfig-ultimate/rendering.nix b/pkgs/development/libraries/fontconfig-ultimate/rendering.nix deleted file mode 100644 index b1de43b49b2..00000000000 --- a/pkgs/development/libraries/fontconfig-ultimate/rendering.nix +++ /dev/null @@ -1,212 +0,0 @@ -{}: - -rec { - default = { - INFINALITY_FT_FILTER_PARAMS="11 22 38 22 11"; - INFINALITY_FT_GRAYSCALE_FILTER_STRENGTH="0"; - INFINALITY_FT_FRINGE_FILTER_STRENGTH="0"; - INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="10"; - INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="25"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="10"; - INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="25"; - INFINALITY_FT_STEM_FITTING_STRENGTH="25"; - INFINALITY_FT_GAMMA_CORRECTION="0 100"; - INFINALITY_FT_BRIGHTNESS="0"; - INFINALITY_FT_CONTRAST="0"; - INFINALITY_FT_USE_VARIOUS_TWEAKS="true"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="true"; - INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="100"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="40"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="true"; - INFINALITY_FT_GLOBAL_EMBOLDEN_X_VALUE="0"; - INFINALITY_FT_GLOBAL_EMBOLDEN_Y_VALUE="0"; - INFINALITY_FT_BOLD_EMBOLDEN_X_VALUE="0"; - INFINALITY_FT_BOLD_EMBOLDEN_Y_VALUE="0"; - }; - - osx = default // { - INFINALITY_FT_FILTER_PARAMS="03 32 38 32 03"; - INFINALITY_FT_GRAYSCALE_FILTER_STRENGTH="25"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_GAMMA_CORRECTION="1000 80"; - INFINALITY_FT_BRIGHTNESS="10"; - INFINALITY_FT_CONTRAST="20"; - INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - INFINALITY_FT_GLOBAL_EMBOLDEN_Y_VALUE="8"; - INFINALITY_FT_BOLD_EMBOLDEN_X_VALUE="16"; - }; - - ipad = default // { - INFINALITY_FT_FILTER_PARAMS="00 00 100 00 00"; - INFINALITY_FT_GRAYSCALE_FILTER_STRENGTH="100"; - INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="0"; - INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="0"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_GAMMA_CORRECTION="1000 80"; - INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - }; - - ubuntu = default // { - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_GAMMA_CORRECTION="1000 80"; - INFINALITY_FT_BRIGHTNESS="-10"; - INFINALITY_FT_CONTRAST="15"; - INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - }; - - linux = default // { - INFINALITY_FT_FILTER_PARAMS="06 25 44 25 06"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="100"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - }; - - winxplight = default // { - INFINALITY_FT_FILTER_PARAMS="06 25 44 25 06"; - INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="15"; - INFINALITY_FT_STEM_FITTING_STRENGTH="15"; - INFINALITY_FT_GAMMA_CORRECTION="1000 120"; - INFINALITY_FT_BRIGHTNESS="20"; - INFINALITY_FT_CONTRAST="30"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; - }; - - win7light = default // { - INFINALITY_FT_FILTER_PARAMS="20 25 38 25 05"; - INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="100"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_GAMMA_CORRECTION="1000 160"; - INFINALITY_FT_CONTRAST="20"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; - }; - - winxp = default // { - INFINALITY_FT_FILTER_PARAMS="06 25 44 25 06"; - INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="15"; - INFINALITY_FT_STEM_FITTING_STRENGTH="15"; - INFINALITY_FT_GAMMA_CORRECTION="1000 120"; - INFINALITY_FT_BRIGHTNESS="10"; - INFINALITY_FT_CONTRAST="20"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; - }; - - win7 = default // { - INFINALITY_FT_FILTER_PARAMS="20 25 42 25 06"; - INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_GAMMA_CORRECTION="1000 120"; - INFINALITY_FT_BRIGHTNESS="10"; - INFINALITY_FT_CONTRAST="20"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - }; - - vanilla = default // { - INFINALITY_FT_FILTER_PARAMS="06 25 38 25 06"; - INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="0"; - INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="0"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; - INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; - INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - }; - - classic = default // { - INFINALITY_FT_FILTER_PARAMS="06 25 38 25 06"; - INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="0"; - INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="0"; - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; - INFINALITY_FT_STEM_FITTING_STRENGTH="0"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - }; - - nudge = default // { - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; - INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; - }; - - push = default // { - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="75"; - INFINALITY_FT_STEM_FITTING_STRENGTH="50"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; - }; - - infinality = default // { - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="5"; - }; - - shove = default // { - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; - INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="100"; - INFINALITY_FT_STEM_FITTING_STRENGTH="100"; - INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; - }; - - sharpened = default // { - INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; - }; - - ultimate = { - INFINALITY_FT_FILTER_PARAMS="08 24 36 24 08"; - INFINALITY_FT_FRINGE_FILTER_STRENGTH="50"; - INFINALITY_FT_USE_VARIOUS_TWEAKS="true"; - INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH="20"; - }; - - ultimate-lighter = ultimate // { - INFINALITY_FT_FILTER_PARAMS="06 22 36 22 06"; - }; - - ultimate-lightest = ultimate // { - INFINALITY_FT_FILTER_PARAMS="04 22 38 22 04"; - }; - - ultimate-darker = ultimate // { - INFINALITY_FT_FILTER_PARAMS="10 25 37 25 10"; - }; - - ultimate-darkest = ultimate // { - INFINALITY_FT_FILTER_PARAMS="12 28 42 28 12"; - }; -} diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 6acf1ebce29..74048afe731 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -66,9 +66,7 @@ stdenv.mkDerivation rec { postInstall = '' cd "$out/etc/fonts" - rm conf.d/{50-user,51-local}.conf "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ - --stringparam fontconfig "$out" \ --stringparam fontconfigConfigVersion "${configVersion}" \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index b59fcd0187b..dddbbe9e516 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -28,8 +28,6 @@ <!-- /var/cache/fontconfig is useful for non-nixos systems --> <cachedir>/var/cache/fontconfig</cachedir> - <!-- fontconfig distribution conf.d --> - <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include> <!-- versioned system-wide config --> <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include> diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 0548d1433b7..8ef51172f94 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -1,40 +1,55 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, which, zlib, bzip2, libpng, gnumake +{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, which, zlib, bzip2, libpng, gnumake , glib /* passthru only */ # FreeType supports sub-pixel rendering. This is patented by # Microsoft, so it is disabled by default. This option allows it to # be enabled. See http://www.freetype.org/patents.html. , useEncumberedCode ? true +, useInfinality ? true }: +assert useInfinality -> useEncumberedCode; + let - version = "2.6.2"; + version = "2.6.5"; - # Don't use fetchpatch. It mangles them. That's an hour I'll never get back. - fetchbohoomil = name: sha256: fetchurl { - url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/254b688f96d4a37f78fb594303a43160fc15c7cd/freetype/ + name; - inherit sha256; + infinality = fetchFromGitHub { + owner = "archfan"; + repo = "infinality_bundle"; + rev = "5c0949a477bf43d2ac4e57b4fc39bcc3331002ee"; + sha256 = "17389aqm6rlxl4b5mv1fx4b22x2v2n60hfhixfxqxpd8ialsdi6l"; }; + in with { inherit (stdenv.lib) optional optionals optionalString; }; stdenv.mkDerivation rec { name = "freetype-${version}"; src = fetchurl { - url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "14mqrfgl18q2by1yzv6vcxi97zjy4kppcgsqf312mhfwgkpvvxms"; + url = "mirror://savannah/freetype/${name}.tar.bz2"; + sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2"; }; - patches = [] - # mingw: these patches use `strcasestr` which isn't available on windows - ++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [ - (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch" - "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08") - (fetchbohoomil "02-upstream-2015.12.05.patch" - "0781r9n35kpn8db8nma0l47cpkzh0hbp84ziii5sald90dnrqdj4") - (fetchbohoomil "03-infinality-2.6.2-2015.12.05.patch" - "0wcjf9hiymplgqm3szla633i417pb57vpzzs2dyl1dnmcxgqa2y8") - ]; + patches = [ + # Patch for validation of OpenType and GX/AAT tables. + (fetchurl { + name = "freetype-2.2.1-enable-valid.patch"; + url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990"; + sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l"; + }) + ] ++ optionals (!useInfinality && useEncumberedCode) [ + # Patch to enable subpixel rendering. + # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html. + (fetchurl { + name = "freetype-2.3.0-enable-spr.patch"; + url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990; + sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd"; + }) + ]; + + prePatch = optionalString useInfinality '' + patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)" + ''; outputs = [ "dev" "out" ]; @@ -44,10 +59,8 @@ stdenv.mkDerivation rec { # FreeType requires GNU Make, which is not part of stdenv on FreeBSD. ++ optional (!stdenv.isLinux) gnumake; - configureFlags = "--disable-static --bindir=$(dev)/bin"; + configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ]; - # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 - NIX_CFLAGS_COMPILE = "-fno-strict-aliasing"; # The asm for armel is written with the 'asm' keyword. CFLAGS = optionalString stdenv.isArm "-std=gnu99"; @@ -66,7 +79,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A font rendering engine"; - homepage = http://www.freetype.org/; + longDescription = '' + FreeType is a portable and efficient library for rendering fonts. It + supports TrueType, Type 1, CFF fonts, and WOFF, PCF, FNT, BDF and PFR + fonts. It has a bytecode interpreter and has an automatic hinter called + autofit which can be used instead of hinting instructions included in + fonts. + ''; + homepage = https://www.freetype.org/; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) #ToDo: encumbered = useEncumberedCode; platforms = platforms.all; diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index bd5ee16eb67..71b65131015 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { doCheck = true; + configureFlags = [ "--enable-libgdbm-compat" ]; + meta = with stdenv.lib; { description = "GNU dbm key/value database library"; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index c2121f31f1d..2d7e26b9e1a 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.4.6"; + version = "2.6.4"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "0rgqgkjyqgld0hpa311z8cddp42v9ihzidyanwyxqpv3jmcrlsfk"; + sha256 = "14bysjdldq7xb9k1ayskxijm08dy2n45v9bg379dqrcz1q5xq5mi"; }; dontUseCmakeBuildDir = true; diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix index f66ade28da9..2a201ed5523 100644 --- a/pkgs/development/libraries/gegl/3.0.nix +++ b/pkgs/development/libraries/gegl/3.0.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which -, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }: +, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib , libraw }: stdenv.mkDerivation rec { name = "gegl-0.3.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-docs"; buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool - autoconf automake libtool which json_glib ]; + autoconf automake libtool which json_glib libraw ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 3c044bb6efa..e82b4385a9c 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -40,7 +40,7 @@ let ''; ver_maj = "2.48"; - ver_min = "1"; + ver_min = "2"; in stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612"; + sha256 = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index e90fdc4ad7b..d7e91642342 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -10,9 +10,8 @@ cross: , preConfigure ? "", ... }@args: let - - version = "2.23"; - sha256 = "1lk9a8jv5kyx8hp0wmfzjyk047q95ybyjqbyw5idl7414jxqml1b"; + version = "2.24"; + sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by"; in assert cross != null -> gccCross != null; @@ -49,12 +48,6 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch - - ./cve-2016-3075.patch - ./glob-simplify-interface.patch - ./cve-2016-1234.patch - ./cve-2016-3706.patch - ./fix_warnings.patch ]; postPatch = @@ -89,7 +82,6 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--enable-obsolete-rpc" "--sysconfdir=/etc" - "--localedir=/var/run/current-system/sw/lib/locale" "libc_cv_ssp=no" (if linuxHeaders != null then "--with-headers=${linuxHeaders}/include" diff --git a/pkgs/development/libraries/glibc/cve-2016-1234.patch b/pkgs/development/libraries/glibc/cve-2016-1234.patch deleted file mode 100644 index d98577868a9..00000000000 --- a/pkgs/development/libraries/glibc/cve-2016-1234.patch +++ /dev/null @@ -1,372 +0,0 @@ -commit c87db3fcbdf890990b44d956621763538c878cd3 -Author: Florian Weimer <fweimer@redhat.com> -Date: Wed May 4 12:09:35 2016 +0200 - - CVE-2016-1234: glob: Do not copy d_name field of struct dirent [BZ #19779] - - Instead, we store the data we need from the return value of - readdir in an object of the new type struct readdir_result. - This type is independent of the layout of struct dirent. - - (cherry picked from commit 5171f3079f2cc53e0548fc4967361f4d1ce9d7ea) - -diff --git a/posix/bug-glob2.c b/posix/bug-glob2.c -index 0fdc5d0..5873e08 100644 ---- a/posix/bug-glob2.c -+++ b/posix/bug-glob2.c -@@ -40,6 +40,17 @@ - # define PRINTF(fmt, args...) - #endif - -+#define LONG_NAME \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \ -+ "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - - static struct - { -@@ -58,6 +69,7 @@ static struct - { ".", 3, DT_DIR, 0755 }, - { "..", 3, DT_DIR, 0755 }, - { "a", 3, DT_REG, 0644 }, -+ { LONG_NAME, 3, DT_REG, 0644 }, - { "unreadable", 2, DT_DIR, 0111 }, - { ".", 3, DT_DIR, 0111 }, - { "..", 3, DT_DIR, 0755 }, -@@ -75,7 +87,7 @@ typedef struct - int level; - int idx; - struct dirent d; -- char room_for_dirent[NAME_MAX]; -+ char room_for_dirent[sizeof (LONG_NAME)]; - } my_DIR; - - -diff --git a/posix/glob.c b/posix/glob.c -index 9ae76ac..ea4b0b6 100644 ---- a/posix/glob.c -+++ b/posix/glob.c -@@ -24,7 +24,9 @@ - #include <errno.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <stdbool.h> - #include <stddef.h> -+#include <stdint.h> - - /* Outcomment the following line for production quality code. */ - /* #define NDEBUG 1 */ -@@ -73,69 +75,8 @@ - # endif /* HAVE_VMSDIR_H */ - #endif - -- --/* When used in the GNU libc the symbol _DIRENT_HAVE_D_TYPE is available -- if the `d_type' member for `struct dirent' is available. -- HAVE_STRUCT_DIRENT_D_TYPE plays the same role in GNULIB. */ --#if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE --/* True if the directory entry D must be of type T. */ --# define DIRENT_MUST_BE(d, t) ((d)->d_type == (t)) -- --/* True if the directory entry D might be a symbolic link. */ --# define DIRENT_MIGHT_BE_SYMLINK(d) \ -- ((d)->d_type == DT_UNKNOWN || (d)->d_type == DT_LNK) -- --/* True if the directory entry D might be a directory. */ --# define DIRENT_MIGHT_BE_DIR(d) \ -- ((d)->d_type == DT_DIR || DIRENT_MIGHT_BE_SYMLINK (d)) -- --#else /* !HAVE_D_TYPE */ --# define DIRENT_MUST_BE(d, t) false --# define DIRENT_MIGHT_BE_SYMLINK(d) true --# define DIRENT_MIGHT_BE_DIR(d) true --#endif /* HAVE_D_TYPE */ -- --/* If the system has the `struct dirent64' type we use it internally. */ --#if defined _LIBC && !defined COMPILE_GLOB64 -- --# if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ --# define CONVERT_D_INO(d64, d32) --# else --# define CONVERT_D_INO(d64, d32) \ -- (d64)->d_ino = (d32)->d_ino; --# endif -- --# ifdef _DIRENT_HAVE_D_TYPE --# define CONVERT_D_TYPE(d64, d32) \ -- (d64)->d_type = (d32)->d_type; --# else --# define CONVERT_D_TYPE(d64, d32) --# endif -- --# define CONVERT_DIRENT_DIRENT64(d64, d32) \ -- strcpy ((d64)->d_name, (d32)->d_name); \ -- CONVERT_D_INO (d64, d32) \ -- CONVERT_D_TYPE (d64, d32) --#endif -- -- --#if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ --/* Posix does not require that the d_ino field be present, and some -- systems do not provide it. */ --# define REAL_DIR_ENTRY(dp) 1 --#else --# define REAL_DIR_ENTRY(dp) (dp->d_ino != 0) --#endif /* POSIX */ -- - #include <stdlib.h> - #include <string.h> -- --/* NAME_MAX is usually defined in <dirent.h> or <limits.h>. */ --#include <limits.h> --#ifndef NAME_MAX --# define NAME_MAX (sizeof (((struct dirent *) 0)->d_name)) --#endif -- - #include <alloca.h> - - #ifdef _LIBC -@@ -180,8 +121,111 @@ - - static const char *next_brace_sub (const char *begin, int flags) __THROWNL; - -+/* A representation of a directory entry which does not depend on the -+ layout of struct dirent, or the size of ino_t. */ -+struct readdir_result -+{ -+ const char *name; -+# if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE -+ uint8_t type; -+# endif -+ bool skip_entry; -+}; -+ -+# if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE -+/* Initializer based on the d_type member of struct dirent. */ -+# define D_TYPE_TO_RESULT(source) (source)->d_type, -+ -+/* True if the directory entry D might be a symbolic link. */ -+static bool -+readdir_result_might_be_symlink (struct readdir_result d) -+{ -+ return d.type == DT_UNKNOWN || d.type == DT_LNK; -+} -+ -+/* True if the directory entry D might be a directory. */ -+static bool -+readdir_result_might_be_dir (struct readdir_result d) -+{ -+ return d.type == DT_DIR || readdir_result_might_be_symlink (d); -+} -+# else /* defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE */ -+# define D_TYPE_TO_RESULT(source) -+ -+/* If we do not have type information, symbolic links and directories -+ are always a possibility. */ -+ -+static bool -+readdir_result_might_be_symlink (struct readdir_result d) -+{ -+ return true; -+} -+ -+static bool -+readdir_result_might_be_dir (struct readdir_result d) -+{ -+ return true; -+} -+ -+# endif /* defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE */ -+ -+# if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ -+/* Initializer for skip_entry. POSIX does not require that the d_ino -+ field be present, and some systems do not provide it. */ -+# define D_INO_TO_RESULT(source) false, -+# else -+# define D_INO_TO_RESULT(source) (source)->d_ino == 0, -+# endif -+ -+/* Construct an initializer for a struct readdir_result object from a -+ struct dirent *. No copy of the name is made. */ -+#define READDIR_RESULT_INITIALIZER(source) \ -+ { \ -+ source->d_name, \ -+ D_TYPE_TO_RESULT (source) \ -+ D_INO_TO_RESULT (source) \ -+ } -+ - #endif /* !defined _LIBC || !defined GLOB_ONLY_P */ - -+/* Call gl_readdir on STREAM. This macro can be overridden to reduce -+ type safety if an old interface version needs to be supported. */ -+#ifndef GL_READDIR -+# define GL_READDIR(pglob, stream) ((pglob)->gl_readdir (stream)) -+#endif -+ -+/* Extract name and type from directory entry. No copy of the name is -+ made. If SOURCE is NULL, result name is NULL. Keep in sync with -+ convert_dirent64 below. */ -+static struct readdir_result -+convert_dirent (const struct dirent *source) -+{ -+ if (source == NULL) -+ { -+ struct readdir_result result = { NULL, }; -+ return result; -+ } -+ struct readdir_result result = READDIR_RESULT_INITIALIZER (source); -+ return result; -+} -+ -+#ifndef COMPILE_GLOB64 -+/* Like convert_dirent, but works on struct dirent64 instead. Keep in -+ sync with convert_dirent above. */ -+static struct readdir_result -+convert_dirent64 (const struct dirent64 *source) -+{ -+ if (source == NULL) -+ { -+ struct readdir_result result = { NULL, }; -+ return result; -+ } -+ struct readdir_result result = READDIR_RESULT_INITIALIZER (source); -+ return result; -+} -+#endif -+ -+ - #ifndef attribute_hidden - # define attribute_hidden - #endif -@@ -1538,55 +1582,36 @@ glob_in_dir (const char *pattern, const char *directory, int flags, - - while (1) - { -- const char *name; --#if defined _LIBC && !defined COMPILE_GLOB64 -- struct dirent64 *d; -- union -- { -- struct dirent64 d64; -- char room [offsetof (struct dirent64, d_name[0]) -- + NAME_MAX + 1]; -- } -- d64buf; -- -- if (__glibc_unlikely (flags & GLOB_ALTDIRFUNC)) -- { -- struct dirent *d32 = (*pglob->gl_readdir) (stream); -- if (d32 != NULL) -- { -- CONVERT_DIRENT_DIRENT64 (&d64buf.d64, d32); -- d = &d64buf.d64; -- } -- else -- d = NULL; -- } -- else -- d = __readdir64 (stream); -+ struct readdir_result d; -+ { -+ if (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)) -+ d = convert_dirent (GL_READDIR (pglob, stream)); -+ else -+ { -+#ifdef COMPILE_GLOB64 -+ d = convert_dirent (__readdir (stream)); - #else -- struct dirent *d = (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0) -- ? ((struct dirent *) -- (*pglob->gl_readdir) (stream)) -- : __readdir (stream)); -+ d = convert_dirent64 (__readdir64 (stream)); - #endif -- if (d == NULL) -+ } -+ } -+ if (d.name == NULL) - break; -- if (! REAL_DIR_ENTRY (d)) -+ if (d.skip_entry) - continue; - - /* If we shall match only directories use the information - provided by the dirent call if possible. */ -- if ((flags & GLOB_ONLYDIR) && !DIRENT_MIGHT_BE_DIR (d)) -+ if ((flags & GLOB_ONLYDIR) && !readdir_result_might_be_dir (d)) - continue; - -- name = d->d_name; -- -- if (fnmatch (pattern, name, fnm_flags) == 0) -+ if (fnmatch (pattern, d.name, fnm_flags) == 0) - { - /* If the file we found is a symlink we have to - make sure the target file exists. */ -- if (!DIRENT_MIGHT_BE_SYMLINK (d) -- || link_exists_p (dfd, directory, dirlen, name, pglob, -- flags)) -+ if (!readdir_result_might_be_symlink (d) -+ || link_exists_p (dfd, directory, dirlen, d.name, -+ pglob, flags)) - { - if (cur == names->count) - { -@@ -1606,7 +1631,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags, - names = newnames; - cur = 0; - } -- names->name[cur] = strdup (d->d_name); -+ names->name[cur] = strdup (d.name); - if (names->name[cur] == NULL) - goto memory_error; - ++cur; -diff --git a/sysdeps/unix/sysv/linux/i386/glob64.c b/sysdeps/unix/sysv/linux/i386/glob64.c -index b4fcd1a..802c957 100644 ---- a/sysdeps/unix/sysv/linux/i386/glob64.c -+++ b/sysdeps/unix/sysv/linux/i386/glob64.c -@@ -1,3 +1,21 @@ -+/* Two glob variants with 64-bit support, for dirent64 and __olddirent64. -+ Copyright (C) 1998-2016 Free Software Foundation, Inc. -+ This file is part of the GNU C Library. -+ -+ The GNU C Library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ The GNU C Library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with the GNU C Library; if not, see -+ <http://www.gnu.org/licenses/>. */ -+ - #include <dirent.h> - #include <glob.h> - #include <sys/stat.h> -@@ -38,11 +56,15 @@ int __old_glob64 (const char *__pattern, int __flags, - - #undef dirent - #define dirent __old_dirent64 -+#undef GL_READDIR -+# define GL_READDIR(pglob, stream) \ -+ ((struct __old_dirent64 *) (pglob)->gl_readdir (stream)) - #undef __readdir - #define __readdir(dirp) __old_readdir64 (dirp) - #undef glob - #define glob(pattern, flags, errfunc, pglob) \ - __old_glob64 (pattern, flags, errfunc, pglob) -+#define convert_dirent __old_convert_dirent - #define glob_in_dir __old_glob_in_dir - #define GLOB_ATTRIBUTE attribute_compat_text_section - diff --git a/pkgs/development/libraries/glibc/cve-2016-3075.patch b/pkgs/development/libraries/glibc/cve-2016-3075.patch deleted file mode 100644 index 0da10167bef..00000000000 --- a/pkgs/development/libraries/glibc/cve-2016-3075.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 146b58d11fddbef15b888906e3be4f33900c416f -Author: Florian Weimer <fweimer@redhat.com> -Date: Tue Mar 29 12:57:56 2016 +0200 - - CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879] - - The defensive copy is not needed because the name may not alias the - output buffer. - - (cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4) - (cherry picked from commit 883dceebc8f11921a9890211a4e202e5be17562f) - -diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c -index 2eb2f67..8f301a7 100644 ---- a/resolv/nss_dns/dns-network.c -+++ b/resolv/nss_dns/dns-network.c -@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, - } net_buffer; - querybuf *orig_net_buffer; - int anslen; -- char *qbuf; - enum nss_status status; - - if (__res_maybe_init (&_res, 0) == -1) - return NSS_STATUS_UNAVAIL; - -- qbuf = strdupa (name); -- - net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); - -- anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf, -+ anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf, - 1024, &net_buffer.ptr, NULL, NULL, NULL, NULL); - if (anslen < 0) - { diff --git a/pkgs/development/libraries/glibc/cve-2016-3706.patch b/pkgs/development/libraries/glibc/cve-2016-3706.patch deleted file mode 100644 index cf9fb060355..00000000000 --- a/pkgs/development/libraries/glibc/cve-2016-3706.patch +++ /dev/null @@ -1,181 +0,0 @@ -commit 1a8a7c12950a0026a3c406a7cb1608f96aa1460e -Author: Florian Weimer <fweimer@redhat.com> -Date: Fri Apr 29 10:35:34 2016 +0200 - - CVE-2016-3706: getaddrinfo: stack overflow in hostent conversion [BZ #20010] - - When converting a struct hostent response to struct gaih_addrtuple, the - gethosts macro (which is called from gaih_inet) used alloca, without - malloc fallback for large responses. This commit changes this code to - use calloc unconditionally. - - This commit also consolidated a second hostent-to-gaih_addrtuple - conversion loop (in gaih_inet) to use the new conversion function. - - (cherry picked from commit 4ab2ab03d4351914ee53248dc5aef4a8c88ff8b9) - -diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index 1ef3f20..fed2d3b 100644 ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -168,9 +168,58 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, - return 0; - } - -+/* Convert struct hostent to a list of struct gaih_addrtuple objects. -+ h_name is not copied, and the struct hostent object must not be -+ deallocated prematurely. *RESULT must be NULL or a pointer to an -+ object allocated using malloc, which is freed. */ -+static bool -+convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, -+ int family, -+ struct hostent *h, -+ struct gaih_addrtuple **result) -+{ -+ free (*result); -+ *result = NULL; -+ -+ /* Count the number of addresses in h->h_addr_list. */ -+ size_t count = 0; -+ for (char **p = h->h_addr_list; *p != NULL; ++p) -+ ++count; -+ -+ /* Report no data if no addresses are available, or if the incoming -+ address size is larger than what we can store. */ -+ if (count == 0 || h->h_length > sizeof (((struct gaih_addrtuple) {}).addr)) -+ return true; -+ -+ struct gaih_addrtuple *array = calloc (count, sizeof (*array)); -+ if (array == NULL) -+ return false; -+ -+ for (size_t i = 0; i < count; ++i) -+ { -+ if (family == AF_INET && req->ai_family == AF_INET6) -+ { -+ /* Perform address mapping. */ -+ array[i].family = AF_INET6; -+ memcpy(array[i].addr + 3, h->h_addr_list[i], sizeof (uint32_t)); -+ array[i].addr[2] = htonl (0xffff); -+ } -+ else -+ { -+ array[i].family = family; -+ memcpy (array[i].addr, h->h_addr_list[i], h->h_length); -+ } -+ array[i].next = array + i + 1; -+ } -+ array[0].name = h->h_name; -+ array[count - 1].next = NULL; -+ -+ *result = array; -+ return true; -+} -+ - #define gethosts(_family, _type) \ - { \ -- int i; \ - int herrno; \ - struct hostent th; \ - struct hostent *h; \ -@@ -219,36 +268,23 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp, - } \ - else if (h != NULL) \ - { \ -- for (i = 0; h->h_addr_list[i]; i++) \ -+ /* Make sure that addrmem can be freed. */ \ -+ if (!malloc_addrmem) \ -+ addrmem = NULL; \ -+ if (!convert_hostent_to_gaih_addrtuple (req, _family,h, &addrmem)) \ - { \ -- if (*pat == NULL) \ -- { \ -- *pat = __alloca (sizeof (struct gaih_addrtuple)); \ -- (*pat)->scopeid = 0; \ -- } \ -- uint32_t *addr = (*pat)->addr; \ -- (*pat)->next = NULL; \ -- (*pat)->name = i == 0 ? strdupa (h->h_name) : NULL; \ -- if (_family == AF_INET && req->ai_family == AF_INET6) \ -- { \ -- (*pat)->family = AF_INET6; \ -- addr[3] = *(uint32_t *) h->h_addr_list[i]; \ -- addr[2] = htonl (0xffff); \ -- addr[1] = 0; \ -- addr[0] = 0; \ -- } \ -- else \ -- { \ -- (*pat)->family = _family; \ -- memcpy (addr, h->h_addr_list[i], sizeof(_type)); \ -- } \ -- pat = &((*pat)->next); \ -+ _res.options |= old_res_options & RES_USE_INET6; \ -+ result = -EAI_SYSTEM; \ -+ goto free_and_return; \ - } \ -+ *pat = addrmem; \ -+ /* The conversion uses malloc unconditionally. */ \ -+ malloc_addrmem = true; \ - \ - if (localcanon != NULL && canon == NULL) \ - canon = strdupa (localcanon); \ - \ -- if (_family == AF_INET6 && i > 0) \ -+ if (_family == AF_INET6 && *pat != NULL) \ - got_ipv6 = true; \ - } \ - } -@@ -612,44 +648,16 @@ gaih_inet (const char *name, const struct gaih_service *service, - { - if (h != NULL) - { -- int i; -- /* We found data, count the number of addresses. */ -- for (i = 0; h->h_addr_list[i]; ++i) -- ; -- if (i > 0 && *pat != NULL) -- --i; -- -- if (__libc_use_alloca (alloca_used -- + i * sizeof (struct gaih_addrtuple))) -- addrmem = alloca_account (i * sizeof (struct gaih_addrtuple), -- alloca_used); -- else -- { -- addrmem = malloc (i -- * sizeof (struct gaih_addrtuple)); -- if (addrmem == NULL) -- { -- result = -EAI_MEMORY; -- goto free_and_return; -- } -- malloc_addrmem = true; -- } -- -- /* Now convert it into the list. */ -- struct gaih_addrtuple *addrfree = addrmem; -- for (i = 0; h->h_addr_list[i]; ++i) -+ /* We found data, convert it. */ -+ if (!convert_hostent_to_gaih_addrtuple -+ (req, AF_INET, h, &addrmem)) - { -- if (*pat == NULL) -- { -- *pat = addrfree++; -- (*pat)->scopeid = 0; -- } -- (*pat)->next = NULL; -- (*pat)->family = AF_INET; -- memcpy ((*pat)->addr, h->h_addr_list[i], -- h->h_length); -- pat = &((*pat)->next); -+ result = -EAI_MEMORY; -+ goto free_and_return; - } -+ *pat = addrmem; -+ /* The conversion uses malloc unconditionally. */ -+ malloc_addrmem = true; - } - } - else diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 2a1652a5501..4d377bb93cb 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -70,7 +70,7 @@ in fi # Get rid of more unnecessary stuff. - rm -rf $out/var $out/sbin/sln + rm -rf $out/var $bin/bin/sln # For some reason these aren't stripped otherwise and retain reference # to bootstrap-tools; on cross-arm this stripping would break objects. diff --git a/pkgs/development/libraries/glibc/fix_warnings.patch b/pkgs/development/libraries/glibc/fix_warnings.patch deleted file mode 100644 index fd75c18c84e..00000000000 --- a/pkgs/development/libraries/glibc/fix_warnings.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/stdlib/setenv.c 2016-05-30 11:09:14.487180254 +0000 -+++ b/stdlib/setenv.c 2016-05-30 11:08:25.560390748 +0000 -@@ -277,6 +277,7 @@ - - ep = __environ; - if (ep != NULL) -+ { - while (*ep != NULL) - if (!strncmp (*ep, name, len) && (*ep)[len] == '=') - { -@@ -290,6 +291,7 @@ - } - else - ++ep; -+ } - - UNLOCK; - ---- a/nis/nis_call.c 2016-05-30 08:05:59.359855696 -0700 -+++ b/nis/nis_call.c 2016-05-30 08:05:55.679873221 -0700 -@@ -680,6 +680,7 @@ - /* Choose which entry should be evicted from the cache. */ - loc = &nis_server_cache[0]; - if (*loc != NULL) -+ { - for (i = 1; i < 16; ++i) - if (nis_server_cache[i] == NULL) - { -@@ -690,6 +691,7 @@ - || ((*loc)->uses == nis_server_cache[i]->uses - && (*loc)->expires > nis_server_cache[i]->expires)) - loc = &nis_server_cache[i]; -+ } - old = *loc; - *loc = new; - diff --git a/pkgs/development/libraries/glibc/glob-simplify-interface.patch b/pkgs/development/libraries/glibc/glob-simplify-interface.patch deleted file mode 100644 index 647cca8b3a6..00000000000 --- a/pkgs/development/libraries/glibc/glob-simplify-interface.patch +++ /dev/null @@ -1,216 +0,0 @@ -commit 68302147ee061c69eb447e243ad9a18ef4cfbc4c -Author: Florian Weimer <fweimer@redhat.com> -Date: Fri Apr 29 09:33:07 2016 +0200 - - glob: Simplify the interface for the GLOB_ALTDIRFUNC callback gl_readdir - - Previously, application code had to set up the d_namlen member if - the target supported it, involving conditional compilation. After - this change, glob will use the length of the string in d_name instead - of d_namlen to determine the file name length. All glibc targets - provide the d_type and d_ino members, and setting them as needed for - gl_readdir is straightforward. - - Changing the behavior with regards to d_ino is left to a future - cleanup. - - (cherry picked from commit 137fe72eca6923a00381a3ca9f0e7672c1f85e3f) - -diff --git a/manual/examples/mkdirent.c b/manual/examples/mkdirent.c -new file mode 100644 -index 0000000..f8400f4 ---- /dev/null -+++ b/manual/examples/mkdirent.c -@@ -0,0 +1,42 @@ -+/* Example for creating a struct dirent object for use with glob. -+ Copyright (C) 2016 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ as published by the Free Software Foundation; either version 2 -+ of the License, or (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, if not, see <http://www.gnu.org/licenses/>. -+*/ -+ -+#include <dirent.h> -+#include <errno.h> -+#include <stddef.h> -+#include <stdlib.h> -+#include <string.h> -+ -+struct dirent * -+mkdirent (const char *name) -+{ -+ size_t dirent_size = offsetof (struct dirent, d_name) + 1; -+ size_t name_length = strlen (name); -+ size_t total_size = dirent_size + name_length; -+ if (total_size < dirent_size) -+ { -+ errno = ENOMEM; -+ return NULL; -+ } -+ struct dirent *result = malloc (total_size); -+ if (result == NULL) -+ return NULL; -+ result->d_type = DT_UNKNOWN; -+ result->d_ino = 1; /* Do not skip this entry. */ -+ memcpy (result->d_name, name, name_length + 1); -+ return result; -+} -diff --git a/manual/pattern.texi b/manual/pattern.texi -index d1b9275..565e7eb 100644 ---- a/manual/pattern.texi -+++ b/manual/pattern.texi -@@ -237,7 +237,44 @@ function used to read the contents of a directory. It is used if the - @code{GLOB_ALTDIRFUNC} bit is set in the flag parameter. The type of - this field is @w{@code{struct dirent *(*) (void *)}}. - --This is a GNU extension. -+An implementation of @code{gl_readdir} needs to initialize the following -+members of the @code{struct dirent} object: -+ -+@table @code -+@item d_type -+This member should be set to the file type of the entry if it is known. -+Otherwise, the value @code{DT_UNKNOWN} can be used. The @code{glob} -+function may use the specified file type to avoid callbacks in cases -+where the file type indicates that the data is not required. -+ -+@item d_ino -+This member needs to be non-zero, otherwise @code{glob} may skip the -+current entry and call the @code{gl_readdir} callback function again to -+retrieve another entry. -+ -+@item d_name -+This member must be set to the name of the entry. It must be -+null-terminated. -+@end table -+ -+The example below shows how to allocate a @code{struct dirent} object -+containing a given name. -+ -+@smallexample -+@include mkdirent.c.texi -+@end smallexample -+ -+The @code{glob} function reads the @code{struct dirent} members listed -+above and makes a copy of the file name in the @code{d_name} member -+immediately after the @code{gl_readdir} callback function returns. -+Future invocations of any of the callback functions may dealloacte or -+reuse the buffer. It is the responsibility of the caller of the -+@code{glob} function to allocate and deallocate the buffer, around the -+call to @code{glob} or using the callback functions. For example, an -+application could allocate the buffer in the @code{gl_readdir} callback -+function, and deallocate it in the @code{gl_closedir} callback function. -+ -+The @code{gl_readdir} member is a GNU extension. - - @item gl_opendir - The address of an alternative implementation of the @code{opendir} -diff --git a/posix/bug-glob2.c b/posix/bug-glob2.c -index ddf5ec9..0fdc5d0 100644 ---- a/posix/bug-glob2.c -+++ b/posix/bug-glob2.c -@@ -193,7 +193,7 @@ my_readdir (void *gdir) - return NULL; - } - -- dir->d.d_ino = dir->idx; -+ dir->d.d_ino = 1; /* glob should not skip this entry. */ - - #ifdef _DIRENT_HAVE_D_TYPE - dir->d.d_type = filesystem[dir->idx].type; -diff --git a/posix/glob.c b/posix/glob.c -index 0c04c3c..9ae76ac 100644 ---- a/posix/glob.c -+++ b/posix/glob.c -@@ -57,10 +57,8 @@ - - #if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__ - # include <dirent.h> --# define NAMLEN(dirent) strlen((dirent)->d_name) - #else - # define dirent direct --# define NAMLEN(dirent) (dirent)->d_namlen - # ifdef HAVE_SYS_NDIR_H - # include <sys/ndir.h> - # endif -@@ -76,12 +74,6 @@ - #endif - - --/* In GNU systems, <dirent.h> defines this macro for us. */ --#ifdef _D_NAMLEN --# undef NAMLEN --# define NAMLEN(d) _D_NAMLEN(d) --#endif -- - /* When used in the GNU libc the symbol _DIRENT_HAVE_D_TYPE is available - if the `d_type' member for `struct dirent' is available. - HAVE_STRUCT_DIRENT_D_TYPE plays the same role in GNULIB. */ -@@ -105,12 +97,6 @@ - - /* If the system has the `struct dirent64' type we use it internally. */ - #if defined _LIBC && !defined COMPILE_GLOB64 --# if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__ --# define CONVERT_D_NAMLEN(d64, d32) --# else --# define CONVERT_D_NAMLEN(d64, d32) \ -- (d64)->d_namlen = (d32)->d_namlen; --# endif - - # if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__ - # define CONVERT_D_INO(d64, d32) -@@ -127,8 +113,7 @@ - # endif - - # define CONVERT_DIRENT_DIRENT64(d64, d32) \ -- memcpy ((d64)->d_name, (d32)->d_name, NAMLEN (d32) + 1); \ -- CONVERT_D_NAMLEN (d64, d32) \ -+ strcpy ((d64)->d_name, (d32)->d_name); \ - CONVERT_D_INO (d64, d32) \ - CONVERT_D_TYPE (d64, d32) - #endif -@@ -1554,7 +1539,6 @@ glob_in_dir (const char *pattern, const char *directory, int flags, - while (1) - { - const char *name; -- size_t len; - #if defined _LIBC && !defined COMPILE_GLOB64 - struct dirent64 *d; - union -@@ -1622,12 +1606,10 @@ glob_in_dir (const char *pattern, const char *directory, int flags, - names = newnames; - cur = 0; - } -- len = NAMLEN (d); -- names->name[cur] = (char *) malloc (len + 1); -+ names->name[cur] = strdup (d->d_name); - if (names->name[cur] == NULL) - goto memory_error; -- *((char *) mempcpy (names->name[cur++], name, len)) -- = '\0'; -+ ++cur; - ++nfound; - } - } -diff --git a/posix/tst-gnuglob.c b/posix/tst-gnuglob.c -index 992b997..b7b859b 100644 ---- a/posix/tst-gnuglob.c -+++ b/posix/tst-gnuglob.c -@@ -211,7 +211,7 @@ my_readdir (void *gdir) - return NULL; - } - -- dir->d.d_ino = dir->idx; -+ dir->d.d_ino = 1; /* glob should not skip this entry. */ - - #ifdef _DIRENT_HAVE_D_TYPE - dir->d.d_type = filesystem[dir->idx].type; diff --git a/pkgs/development/libraries/gnutls/3.3.nix b/pkgs/development/libraries/gnutls/3.3.nix index c314da388dc..86262d4aef2 100644 --- a/pkgs/development/libraries/gnutls/3.3.nix +++ b/pkgs/development/libraries/gnutls/3.3.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.3.18"; + version = "3.3.24"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-${version}.tar.xz"; - sha256 = "15ckyblhkap3d4sqw0dc9l8wdrnd2aj1fs9m0w0a3bfihvsfg1vs"; + sha256 = "5b65fe2a91c8dfa32bedc78acffcb152e5426cd3349e2afc43cccc9bdaf18aa5"; }; }) diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index 4882e5dda04..2a48d045c51 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,17 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.13"; + version = "3.4.14"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; - sha256 = "0naqs9g5b577j1j7q55ma1vcn78jl2d98h3zrl5rh997wzl8cczx"; + sha256 = "35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23"; }; - - # This fixes some broken parallel dependencies - postPatch = '' - sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am - ''; - - nativeBuildInputs = [ autoreconfHook ]; }) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index 82bd437d721..db35a13cc41 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,17 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.1"; + version = "3.5.3"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "1gdxr1p1sigigwvangqf3v31i8fda07d6ngawykarhr7ls00yjmw"; + sha256 = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"; }; - - # This fixes some broken parallel dependencies - postPatch = '' - sed -i 's,^BUILT_SOURCES =,\0 systemkey-args.h,g' src/Makefile.am - ''; - - nativeBuildInputs = [ autoreconfHook ]; }) diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix index 5a2ff5daa11..4d011ddd463 100644 --- a/pkgs/development/libraries/granite/default.nix +++ b/pkgs/development/libraries/granite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: +{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }: stdenv.mkDerivation rec { majorVersion = "0.3"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz"; }; cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; - buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; + buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext]; meta = { description = "An extension to GTK+ used by elementary OS"; longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS."; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 1a5931d9828..b0409ee2808 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.20"; - ver_min = "8"; + ver_min = "9"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3"; + sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index c33920953ce..ac0425b54ad 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1, vala +, glib, systemd, libusb1, vala_0_23 }: stdenv.mkDerivation rec { name = "gusb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt - systemd libusb1 vala + systemd libusb1 vala_0_23 glib ]; diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d2604b03f74..2f7c42c72b7 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -2,7 +2,7 @@ let pname = "icu4c"; - version = "56.1"; + version = "57.1"; in stdenv.mkDerivation ({ name = pname + "-" + version; @@ -10,7 +10,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; - sha256 = "05j86714qaj0lvhvyr2s1xncw6sk0h2dcghb3iiwykbkbh8fjr1s"; + sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z"; }; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index 9b54ce48239..a332487d4ed 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "1bmdr51wxiir595k2r6z9a7rcgm42kkgnr586xir7vdcndr3pwf8"; }; + # By default, jemalloc puts a je_ prefix onto all its symbols on OSX, which + # then stops downstream builds (mariadb in particular) from detecting it. This + # option should remove the prefix and give us a working jemalloc. + configureFlags = stdenv.lib.optional stdenv.isDarwin "--with-jemalloc-prefix="; + meta = with stdenv.lib; { homepage = http://www.canonware.com/jemalloc/index.html; description = "General purpose malloc(3) implementation"; diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix index d2b9581462b..549be9a71f5 100644 --- a/pkgs/development/libraries/kdevplatform/default.nix +++ b/pkgs/development/libraries/kdevplatform/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b"; }; - patches = [ ./gettext.patch ]; + patches = [ + ./gettext.patch # build error caused by CMake update + ./dependency.patch # build error: https://phabricator.kde.org/D1160 + ]; propagatedBuildInputs = [ kdelibs qt4 phonon ]; buildInputs = [ apr aprutil subversion boost qjson grantlee ]; diff --git a/pkgs/development/libraries/kdevplatform/dependency.patch b/pkgs/development/libraries/kdevplatform/dependency.patch new file mode 100644 index 00000000000..3205b4cab67 --- /dev/null +++ b/pkgs/development/libraries/kdevplatform/dependency.patch @@ -0,0 +1,12 @@ +diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt +--- a/plugins/filetemplates/CMakeLists.txt ++++ b/plugins/filetemplates/CMakeLists.txt +@@ -81,6 +81,7 @@ + ) + + kde4_add_executable(testfiletemplates ${test_srcs}) ++add_dependencies(testfiletemplates kdevfiletemplates) + + target_link_libraries(testfiletemplates + ${KDE4_KDECORE_LIBS} + diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 0dac5e4766f..4cf0c52d88b 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -5,7 +5,7 @@ , glib, dbus_glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala +, python, pygobject, pygtk, gobjectIntrospection, vala_0_23 , monoSupport ? false, mono ? null, gtk-sharp ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib - python pygobject pygtk gobjectIntrospection vala + python pygobject pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 8597e0d9cf1..b7ec7533880 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -9,12 +9,6 @@ in stdenv.mkDerivation { sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj"; }; - patchPhase = '' - substituteInPlace Makefile \ - --replace "/usr" "$out" \ - --replace "{exec_prefix}" "{prefix}" - ''; - meta = { description = "Common functions found on BSD systems"; homepage = http://libbsd.freedesktop.org/; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 3e633f9a365..90880fd4d52 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, lib, file , pkgconfig, intltool , glib, dbus_glib, json_glib -, gobjectIntrospection, vala, gnome_doc_utils +, gobjectIntrospection, vala_0_23, gnome_doc_utils , gtkVersion ? null, gtk2 ? null, gtk3 ? null }: with lib; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib json_glib - gobjectIntrospection vala gnome_doc_utils + gobjectIntrospection vala_0_23 gnome_doc_utils ] ++ optional (gtkVersion != null) (if gtkVersion == "2" then gtk2 else gtk3); postPatch = '' diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix new file mode 100644 index 00000000000..119c92d690d --- /dev/null +++ b/pkgs/development/libraries/libdynd/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, cmake }: + +let version = "0.7.2"; in +stdenv.mkDerivation { + name = "libdynd-${version}"; + + src = fetchFromGitHub { + owner = "libdynd"; + repo = "libdynd"; + rev = "v${version}"; + sha256 = "0fkd5rawqni1cq51fmr76iw7ll4fmbahfwv4rglnsabbkylf73pr"; + }; + + cmakeFlags = [ + "-DDYND_BUILD_BENCHMARKS=OFF" + ]; + + buildInputs = [ cmake ]; + + outputs = [ "dev" "out" ]; + outputDoc = "dev"; + + meta = with stdenv.lib; { + description = "C++ dynamic ndarray library, with Python exposure."; + homepage = http://libdynd.org; + license = licenses.bsd2; + }; +} diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index db17b46b0d3..f4f3c774789 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala +{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala_0_23 , extraOnly ? false }: let inherit (stdenv.lib) optional; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; }; - buildInputs = [ glib gtk intltool pango pkgconfig vala ] + buildInputs = [ glib gtk intltool pango pkgconfig vala_0_23 ] ++ optional (!extraOnly) menu-cache; configureFlags = optional extraOnly "--with-extra-only"; diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 4287c86dbd5..4139af2eac2 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -3,11 +3,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { - name = "libgcrypt-1.5.4"; + name = "libgcrypt-1.5.6"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0czvqxkzd5y872ipy6s010ifwdwv29sqbnqc4pf56sd486gqvy6m"; + sha256 = "0ydy7bgra5jbq9mxl5x031nif3m6y3balc6ndw2ngj11wnsjc61h"; }; buildInputs = diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 58de089a717..237a7ff0094 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "17v8nvvxagcwxz46apzz575l8682kfd78pf00i2kbavfdn8dyd9x"; + sha256 = "0wbh6fq5zi9wg2xcfvfpwh7dv52jihivx1vm4h91c2kx0w8n3b6x"; }; outputs = [ "dev" "out" "info" ]; diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 0cff4aa1913..514aea12c7e 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,7 +4,7 @@ , pkgconfig, autoconf , glib, dbus_glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala, gnome_doc_utils +, python, pygobject, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils , monoSupport ? false, mono ? null, gtk-sharp ? null }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib libdbusmenu-glib - python pygobject pygtk gobjectIntrospection vala gnome_doc_utils + python pygobject pygtk gobjectIntrospection vala_0_23 gnome_doc_utils ] ++ (if gtkVersion == "2" then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] else [ gtk3 ]); diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix new file mode 100644 index 00000000000..14e41961e0a --- /dev/null +++ b/pkgs/development/libraries/libircclient/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "1.9"; + pname = "libircclient"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; + sha256 = "0r60i76jh4drjh2jgp5sx71chagqllmkaq49zv67nrhqwvp9ghw1"; + }; + + outputs = [ "out" "dev" ]; + + configureFlags = [ "--enable-shared" ]; + + postPatch = '' + substituteInPlace src/Makefile.in \ + --replace "@prefix@/include" "@prefix@/include/libircclient" \ + --replace "@libdir@" "@prefix@/lib" \ + --replace "cp " "install " + ''; + + meta = with stdenv.lib; { + description = "A small but extremely powerful library which implements the client IRC protocol"; + homepage = http://www.ulduzsoft.com/libircclient/; + license = licenses.lgpl3; + maintainers = with maintainers; [ obadz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index 83873cc3660..b0b22aa18e7 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, gobjectIntrospection, libsoup -, libxslt, check, vala ? null +, libxslt, check, vala_0_23 ? null }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig intltool gobjectIntrospection libsoup libxslt check vala + pkgconfig intltool gobjectIntrospection libsoup libxslt check vala_0_23 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index ee842b0c4bd..0b196cc22e0 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; }; - buildInputs = [ lcms2 jasper ]; + buildInputs = [ jasper ]; + + propagatedBuildInputs = [ lcms2 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 8495650f02c..5aedc0df2b9 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc -, libgcrypt, gobjectIntrospection }: +, libgcrypt, gobjectIntrospection, vala_0_32 }: let version = "0.18.5"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; - buildInputs = [ libgcrypt gobjectIntrospection ]; + buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ]; # optional: build docs with gtk-doc? (probably needs a flag as well) meta = { diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix new file mode 100644 index 00000000000..78e7036bdcc --- /dev/null +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig +, docSupport ? true, doxygen ? null, graphviz ? null }: + +assert docSupport -> doxygen != null && graphviz != null; + +stdenv.mkDerivation rec { + pname = "libsidplayfp"; + major = "1"; + minor = "8"; + level = "6"; + version = "${major}.${minor}.${level}"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/sidplay-residfp/${pname}/${major}.${minor}/${name}.tar.gz"; + sha256 = "0lzivfdq0crmfr01c6f5h883yr7wvagq198xkk3srdmvshhxmwnw"; + }; + + nativeBuildInputs = [ pkgconfig ] + ++ stdenv.lib.optionals docSupport [ doxygen graphviz ]; + + installTargets = [ "install" ] + ++ stdenv.lib.optionals docSupport [ "doc" ]; + + outputs = [ "out" ] ++ stdenv.lib.optionals docSupport [ "doc" ]; + + postInstall = stdenv.lib.optionalString docSupport '' + mkdir -p $doc/share/doc/libsidplayfp + mv docs/html $doc/share/doc/libsidplayfp/ + ''; + + meta = with stdenv.lib; { + description = "A library to play Commodore 64 music derived from libsidplay2"; + homepage = https://sourceforge.net/projects/sidplay-residfp/; + license = with licenses; [ gpl2Plus ]; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 785e3320cc1..05026a06c61 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection -, valaSupport ? true, vala +, valaSupport ? true, vala_0_23 , libintlOrEmpty , intltool, python }: let @@ -25,7 +25,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" ]; buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] - ++ stdenv.lib.optionals valaSupport [ vala ]; + ++ stdenv.lib.optionals valaSupport [ vala_0_23 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 94e19f97e80..bcbe15afdf8 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, vala, python, intltool, pkgconfig +{ stdenv, fetchurl, vala_0_23, python, intltool, pkgconfig , glib, libgee_0_6, gtk3, dee, libdbusmenu-glib }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libgee_0_6 gtk3 ]; propagatedBuildInputs = [ dee libdbusmenu-glib ]; - nativeBuildInputs = [ vala python intltool pkgconfig ]; + nativeBuildInputs = [ vala_0_23 python intltool pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 0cbac567a45..8065df5c5b5 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; - version = "0.3.6"; + version = "0.4.0"; src = fetchFromGitHub { owner = "i-rinat"; repo = "libvdpau-va-gl"; rev = "v${version}"; - sha256 = "06lcg6zfj6mn17svz7s0y6ijdah55l9rnp9r440lcbixivjbgyn5"; + sha256 = "1y511jxs0df1fqzjcvb6zln7nbmchv1g6z3lw0z9nsf64ziycj8k"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 12b4459cbca..0f9b5b5155b 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -9,11 +9,11 @@ # if you update, also bump pythonPackages.libvirt or it will break stdenv.mkDerivation rec { name = "libvirt-${version}"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.xz"; - sha256 = "1jwszhpjn09zkqji8w1x97rw0wqcl71ll2y6vp056fb1bvshms8h"; + sha256 = "0sriasjc573c519yqw1hcfb3qqjcsm9hm8vayw0anwkl6di9ay8s"; }; patches = [ ./build-on-bsd.patch ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; preConfigure = stdenv.lib.optionalString stdenv.isLinux '' - PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd}/bin:$PATH + PATH=${stdenv.lib.makeBinPath [ iproute iptables ebtables lvm2 systemd ]}:$PATH substituteInPlace configure \ --replace 'as_dummy="/bin:/usr/bin:/usr/sbin"' 'as_dummy="${numad}/bin"' '' + '' @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --replace "$out/bin" "${gettext}/bin" '' + stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/sbin/libvirtd \ - --prefix PATH : ${iptables}/sbin:${iproute}/sbin:${pmutils}/bin:${numad}/bin:${numactl}/bin + --prefix PATH : ${stdenv.lib.makeBinPath [ iptables iproute pmutils numad numactl ]} ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 2bb709612b4..2e51492f142 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate -, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox +{ stdenv, fetchFromGitHub, makeWrapper +, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +, libvorbis, libxml2, movit, pkgconfig, sox +, gtk2 }: stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.6"; + version = "6.2.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "17jwz1lf9ilaxvgvhg7z86dhcsk95m4wlszy4gn7wab2ns5zhdm7"; }; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 - makeWrapper movit pkgconfig qt sox + makeWrapper movit pkgconfig sox + gtk2 ]; # Mostly taken from: @@ -33,7 +38,7 @@ stdenv.mkDerivation rec { description = "Open source multimedia framework, designed for television broadcasting"; homepage = http://www.mltframework.org/; license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.tohl ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mlt/qt-4.nix b/pkgs/development/libraries/mlt/qt-4.nix new file mode 100644 index 00000000000..2bb709612b4 --- /dev/null +++ b/pkgs/development/libraries/mlt/qt-4.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox +}: + +stdenv.mkDerivation rec { + name = "mlt-${version}"; + version = "0.9.6"; + + src = fetchurl { + url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; + sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + }; + + buildInputs = [ + SDL ffmpeg frei0r libjack2 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 = [ + "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3" + "--enable-opengl" + ]; + + enableParallelBuilding = true; + + 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"; + homepage = http://www.mltframework.org/; + license = licenses.gpl3; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index d66d3fe9372..259d5a25d15 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.6"; + version = "6.2.0"; src = fetchurl { url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; + sha256 = "1zwzfgxrcbwkxnkiwv0a1rzxdnnaly90yyarl9wdw84nx11ffbnx"; }; buildInputs = [ diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b38f1e5711a..42a8d00eec0 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 +{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private }: stdenv.mkDerivation rec { - name = "pcl-1.7.2"; + name = "pcl-1.8.0"; - src = fetchzip { - name = name + "-src"; - url = "https://github.com/PointCloudLibrary/pcl/archive/${name}.tar.gz"; - sha256 = "0sm19p6wcls2d9l0vi5fgwqp7l372nh3g7bdin42w31zr8dmz8h8"; + src = fetchFromGitHub { + owner = "PointCloudLibrary"; + repo = "pcl"; + rev = name; + sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 1fb542c2c5f..56d40f81833 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include" ]; nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index e023b122091..ee332171158 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -30,8 +30,8 @@ let --with-g4install-dir=${geant4} \ --with-python-incdir=${python}/include/python${python.majorVersion} \ --with-python-libdir=${python}/lib \ - --with-boost-incdir=${boost}/include \ - --with-boost-libdir=${boost}/lib + --with-boost-incdir=${boost.dev}/include \ + --with-boost-libdir=${boost.out}/lib ''; enableParallelBuilding = true; @@ -47,24 +47,28 @@ let meta = { description = "Python bindings and utilities for Geant4"; longDescription = '' - Geant4 is a toolkit for the simulation of the passage of particles through matter. - Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. - The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. + Geant4 is a toolkit for the simulation of the passage of particles + through matter. Its areas of application include high energy, + nuclear and accelerator physics, as well as studies in medical and + space science. The two main reference papers for Geant4 are + published in Nuclear Instruments and Methods in Physics Research A + 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 + (2006) 270-278. ''; homepage = http://www.geant4.org; license = stdenv.lib.licenses.g4sl; maintainers = [ ]; platforms = stdenv.lib.platforms.all; - }; + }; }; fetchGeant4 = import ../fetch.nix { inherit stdenv fetchurl; - }; + }; in { v10_0_2 = buildG4py { inherit (fetchGeant4.v10_0_2) version src; geant4 = geant4.v10_0_2; - }; -} + }; +} diff --git a/pkgs/development/libraries/poppler/datadir_env.patch b/pkgs/development/libraries/poppler/datadir_env.patch deleted file mode 100644 index fd111d71355..00000000000 --- a/pkgs/development/libraries/poppler/datadir_env.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc -index 2e11bb0..a277ab9 100644 ---- a/poppler/GlobalParams.cc -+++ b/poppler/GlobalParams.cc -@@ -748,7 +748,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir) - void GlobalParams::scanEncodingDirs() { - GDir *dir; - GDirEntry *entry; -- const char *dataRoot = popplerDataDir ? popplerDataDir : POPPLER_DATADIR; -+ const char *dataRoot = popplerDataDir ? popplerDataDir : ( getenv("POPPLER_DATADIR") ? getenv("POPPLER_DATADIR") : POPPLER_DATADIR ); - - // allocate buffer large enough to append "/nameToUnicode" - size_t bufSize = strlen(dataRoot) + strlen("/nameToUnicode") + 1; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index e445af46e09..097031d54f1 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg -, minimal ? false +, withData ? false, poppler_data , qt4Support ? false, qt4 ? null , qt5Support ? false, qtbase ? null -, utils ? false, suffix ? "glib" +, utils ? false +, minimal ? false, suffix ? "glib" }: let # beware: updates often break cups_filters build - version = "0.43.0"; # even major numbers are stable - sha256 = "0mi4zf0pz3x3fx3ir7szz1n57nywgbpd4mp2r7mvf47f4rmf4867"; + version = "0.46.0"; # even major numbers are stable + sha256 = "11z4d5vrrd0m7w9bfydwabksk273z7z0xf2nwvzf5pk17p8kazcn"; in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; @@ -20,22 +21,19 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - patches = [ ./datadir_env.patch ]; + buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data; # TODO: reduce propagation to necessary libs propagatedBuildInputs = with lib; - [ zlib freetype fontconfig libjpeg ] - ++ optionals (!minimal) [ cairo lcms curl openjpeg ] + [ zlib freetype fontconfig libjpeg openjpeg ] + ++ optionals (!minimal) [ cairo lcms curl ] ++ optional qt4Support qt4 ++ optional qt5Support qtbase; - nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig ]; NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - # Any package depending on Qt >= 5.7 must build using the C++11 standard. - CXXFLAGS = lib.optional qt5Support "-std=c++11"; - configureFlags = with lib; [ "--enable-xpdf-headers" @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { ] ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" - "--disable-libopenjpeg" "--disable-libcurl" + "--disable-libcurl" ] ++ optional (!utils) "--disable-utils" ; diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix new file mode 100644 index 00000000000..a06d4cef968 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: + +stdenv.mkDerivation rec { + name = "protobuf-${version}"; + + version = "3.0.0-beta-2"; + # make sure you test also -A pythonPackages.protobuf + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = "v${version}"; + sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; + }; + + postPatch = '' + rm -rf gmock + cp -r ${gmock.source} gmock + chmod -R a+w gmock + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + buildInputs = [ autoreconfHook zlib ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "Google's data interchange format"; + longDescription = + ''Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + homepage = https://developers.google.com/protocol-buffers/; + }; + + passthru.version = version; +} diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index a547dff14cc..16a39daf790 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "protobuf-${version}"; - version = "3.0.0-beta-3.1"; + version = "3.0.0"; # make sure you test also -A pythonPackages.protobuf src = fetchFromGitHub { owner = "google"; repo = "protobuf"; rev = "v${version}"; - sha256 = "1lj3q1wq821q9h2y2hhbnvyy4nw3gl0x2g0kplyvd6ivrissfcqx"; + sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; }; postPatch = '' diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index d4b7c77a5fe..47f66c83ff5 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -25,15 +25,12 @@ stdenv.mkDerivation rec { meta = { description = "Protocol Buffers - Google's data interchange format"; - longDescription = '' Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. ''; - license = "mBSD"; - homepage = https://developers.google.com/protocol-buffers/; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh index 4754535a5f3..c958b5c9eed 100755 --- a/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh +++ b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh @@ -3,16 +3,23 @@ set -x +MAJOR_VERSION="5.5" +VERSION="${MAJOR_VERSION}.1" # The trailing slash at the end is necessary! -RELEASE_URL="http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/" +RELEASE_URLS=( + "http://download.qt.io/official_releases/qt/$MAJOR_VERSION/$VERSION/submodules/" + "http://download.qt.io/community_releases/$MAJOR_VERSION/$VERSION/" +) EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp -wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS +for url in "${RELEASE_URLS[@]}"; do + wget -nH -r -c --no-parent $url $EXTRA_WGET_ARGS +done cat >../srcs.nix <<EOF -# DO NOT EDIT! This file is generated automatically by manifest.sh +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh { fetchurl, mirror }: { @@ -20,7 +27,7 @@ EOF workdir=$(pwd) -find . | while read src; do +find . | sort | while read src; do if [[ -f "${src}" ]]; then url="${src:2}" # Sanitize file name diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index ef64a87d0e2..43eb71ede18 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation { -rpath -optimized-qmake -strip - -reduce-relocations + -no-reduce-relocations -system-proxies -pkg-config diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh index 6d8989281eb..30491983114 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh @@ -61,11 +61,6 @@ _qtMultioutDevs() { preFixupHooks+=(_qtMultioutDevs) -if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" - export NIX_QT_PIC=1 -fi - _qtSetCMakePrefix() { export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" } diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix index 2e92391f4c0..5ccf09515e4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -1,6 +1,6 @@ -{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors +{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt -, sqlite, libudev +, sqlite, libudev, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll , flashplayerFix ? false @@ -10,8 +10,8 @@ with stdenv.lib; qtSubmodule { name = "qtwebkit"; - qtInputs = [ qtdeclarative qtlocation qtmultimedia qtsensors ]; - buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ]; + qtInputs = [ qtdeclarative qtlocation qtsensors ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; nativeBuildInputs = [ bison2 flex gdb gperf perl pkgconfig python ruby ]; diff --git a/pkgs/development/libraries/qt-5/5.5/srcs.nix b/pkgs/development/libraries/qt-5/5.5/srcs.nix index 0cf62081f23..20aa28a55da 100644 --- a/pkgs/development/libraries/qt-5/5.5/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.5/srcs.nix @@ -1,133 +1,125 @@ -# DO NOT EDIT! This file is generated automatically by manifest.sh +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh { fetchurl, mirror }: { - qtx11extras = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz"; - sha256 = "0rgbxgp5l212c4vg8z685zv008j9s03mx8p576ny2qibjwfs11v3"; - name = "qtx11extras-opensource-src-5.5.1.tar.xz"; - }; - }; - qtconnectivity = { + qt3d = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz"; - sha256 = "08sh4hzib5l26l6mc6iil4nvl807cn9rn5w46vxw0bsqz3gfcdrn"; - name = "qtconnectivity-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz"; + sha256 = "1xqvifsy5x2vj7p51c2z1ly7k2yq7l3byhshnkd2bn6b5dp91073"; + name = "qt3d-opensource-src-5.5.1.tar.xz"; }; }; - qttranslations = { + qt5 = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz"; - sha256 = "1im4qzpyp1wqrrrlwc4r56b46w5y4bxg2m0y7wkcmihb1xqh1y21"; - name = "qttranslations-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt5-opensource-src-5.5.1.tar.xz"; + sha256 = "0g83vzsj6hdjmagccy6gxgc1l8q0q6663r9xj58ix4lj7hsphf26"; + name = "qt5-opensource-src-5.5.1.tar.xz"; }; }; - qttools = { + qtactiveqt = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz"; - sha256 = "1zbvr039sv0jzd41ngarxif6954bl50pha8814b5hw3i977gcqa3"; - name = "qttools-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtactiveqt-opensource-src-5.5.1.tar.xz"; + sha256 = "09dz5jj7gxa9ds2gw6xw8lacmv27ydhi64370q1ncc7khd0p6g3m"; + name = "qtactiveqt-opensource-src-5.5.1.tar.xz"; }; }; - qtwebkit = { + qtandroidextras = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz"; - sha256 = "0sbdglcf57lmgbcybimvvbpqikn3blb1pxvd71sdhsiypnfkyn3p"; - name = "qtwebkit-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtandroidextras-opensource-src-5.5.1.tar.xz"; + sha256 = "1cam9zd0kxgyplnaijy91rl8p30j2jbp2ikq9rnigcsglfnx5hd4"; + name = "qtandroidextras-opensource-src-5.5.1.tar.xz"; }; }; - qtimageformats = { + qtbase = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz"; - sha256 = "19alny9bm2lzzlxicbvw56ra4qcxdrnm9054zs4z1y82qq0fwzy9"; - name = "qtimageformats-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz"; + sha256 = "05p91m1d9b3gdfm5pgmxw63rk0fdxqz87s77hn9bdip4syjfi96z"; + name = "qtbase-opensource-src-5.5.1.tar.xz"; }; }; - qtwinextras = { + qtcanvas3d = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz"; - sha256 = "07w5ipiwvvapasjswk0g4ndcp0lq65pz2n6l348zwfb0gand406b"; - name = "qtwinextras-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtcanvas3d-opensource-src-5.5.1.tar.xz"; + sha256 = "105hl3mvsdif416l4dvpxl7r1iw42if8hhrnji8hf4fp6081g6vm"; + name = "qtcanvas3d-opensource-src-5.5.1.tar.xz"; }; }; - qtwebsockets = { + qtconnectivity = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz"; - sha256 = "1srdn668z62j95q1wwhg6xk2dic407r4wl5yi1qk743vhr586kng"; - name = "qtwebsockets-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtconnectivity-opensource-src-5.5.1.tar.xz"; + sha256 = "08sh4hzib5l26l6mc6iil4nvl807cn9rn5w46vxw0bsqz3gfcdrn"; + name = "qtconnectivity-opensource-src-5.5.1.tar.xz"; }; }; - qt3d = { + qtdeclarative = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt3d-opensource-src-5.5.1.tar.xz"; - sha256 = "1xqvifsy5x2vj7p51c2z1ly7k2yq7l3byhshnkd2bn6b5dp91073"; - name = "qt3d-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz"; + sha256 = "14b7naaa0rk4q6cxf0w62gvamxk812kr65k82zxkdzrzp3plxlaz"; + name = "qtdeclarative-opensource-src-5.5.1.tar.xz"; }; }; - qtmacextras = { + qtdoc = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.xz"; - sha256 = "0n4hxi9xhnyvp5cxklr9ygg4ficvahak2w73kr9ihqckrkym0lq2"; - name = "qtmacextras-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdoc-opensource-src-5.5.1.tar.xz"; + sha256 = "11hgw1i1qm2yqzfyg0jsvjda9092hjas35l0bmxn6pvnl5asy3cz"; + name = "qtdoc-opensource-src-5.5.1.tar.xz"; }; }; - qtandroidextras = { + qtenginio = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtandroidextras-opensource-src-5.5.1.tar.xz"; - sha256 = "1cam9zd0kxgyplnaijy91rl8p30j2jbp2ikq9rnigcsglfnx5hd4"; - name = "qtandroidextras-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz"; + sha256 = "1qpg9pcniqp5xxi2qrc6indqdyn850djk0njiniandbabfykd6d7"; + name = "qtenginio-opensource-src-5.5.1.tar.xz"; }; }; - qt5 = { + qtgraphicaleffects = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qt5-opensource-src-5.5.1.tar.xz"; - sha256 = "0g83vzsj6hdjmagccy6gxgc1l8q0q6663r9xj58ix4lj7hsphf26"; - name = "qt5-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; + sha256 = "0irdq4lfbv740mbvd40x62k3zzj0aj8h95gsxg79wa54nf6hzjlv"; + name = "qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; }; }; - qtbase = { + qtimageformats = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtbase-opensource-src-5.5.1.tar.xz"; - sha256 = "05p91m1d9b3gdfm5pgmxw63rk0fdxqz87s77hn9bdip4syjfi96z"; - name = "qtbase-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtimageformats-opensource-src-5.5.1.tar.xz"; + sha256 = "19alny9bm2lzzlxicbvw56ra4qcxdrnm9054zs4z1y82qq0fwzy9"; + name = "qtimageformats-opensource-src-5.5.1.tar.xz"; }; }; - qtxmlpatterns = { + qtlocation = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz"; - sha256 = "1v78s0jygg83yzyldwms8zb72cwp718cc5ialc2ki3lqa81fndxm"; - name = "qtxmlpatterns-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz"; + sha256 = "05k31nm1p444fixplspgh1d5j4f3xz6z674jpr8497v4hz5lis8z"; + name = "qtlocation-opensource-src-5.5.1.tar.xz"; }; }; - qtwayland = { + qtmacextras = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz"; - sha256 = "19nxifpg9q785ahzaii2fd2911cg5m0dpk5v041sylm997f4p063"; - name = "qtwayland-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmacextras-opensource-src-5.5.1.tar.xz"; + sha256 = "0n4hxi9xhnyvp5cxklr9ygg4ficvahak2w73kr9ihqckrkym0lq2"; + name = "qtmacextras-opensource-src-5.5.1.tar.xz"; }; }; - qtwebkit-examples = { + qtmultimedia = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz"; - sha256 = "1ij65v3nzh5f6rdq43w6vmljjgfw1vky8dd6s4kr093d5ns3b289"; - name = "qtwebkit-examples-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz"; + sha256 = "0zwmgmiix56c567qw5xnijd1y43mbjg4jw1n624c31qmyjcwmivw"; + name = "qtmultimedia-opensource-src-5.5.1.tar.xz"; }; }; qtquick1 = { @@ -138,22 +130,6 @@ name = "qtquick1-opensource-src-5.5.1.tar.xz"; }; }; - qtgraphicaleffects = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; - sha256 = "0irdq4lfbv740mbvd40x62k3zzj0aj8h95gsxg79wa54nf6hzjlv"; - name = "qtgraphicaleffects-opensource-src-5.5.1.tar.xz"; - }; - }; - qtlocation = { - version = "5.5.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtlocation-opensource-src-5.5.1.tar.xz"; - sha256 = "05k31nm1p444fixplspgh1d5j4f3xz6z674jpr8497v4hz5lis8z"; - name = "qtlocation-opensource-src-5.5.1.tar.xz"; - }; - }; qtquickcontrols = { version = "5.5.1"; src = fetchurl { @@ -162,12 +138,20 @@ name = "qtquickcontrols-opensource-src-5.5.1.tar.xz"; }; }; - qtwebchannel = { + qtscript = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz"; - sha256 = "1l0m5xjxg5va9dwvgf52r52inl4dl3954d16rfiwnkndazp9ahkz"; - name = "qtwebchannel-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz"; + sha256 = "1z98x3758mk24wf0nxxw4lphbxw1xxzl1q27cjqbq8lgk7fxsind"; + name = "qtscript-opensource-src-5.5.1.tar.xz"; + }; + }; + qtsensors = { + version = "5.5.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz"; + sha256 = "1spfr2pn8zz5vz3qz9lzs0wfshmim6hdgf2fpmwpcpcsfb04y9jx"; + name = "qtsensors-opensource-src-5.5.1.tar.xz"; }; }; qtserialport = { @@ -178,36 +162,44 @@ name = "qtserialport-opensource-src-5.5.1.tar.xz"; }; }; - qtscript = { + qtsvg = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtscript-opensource-src-5.5.1.tar.xz"; - sha256 = "1z98x3758mk24wf0nxxw4lphbxw1xxzl1q27cjqbq8lgk7fxsind"; - name = "qtscript-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz"; + sha256 = "1iwibbh835cpxbfh7rnrpvl9k20valr6h256np59rzdy92z8ixgp"; + name = "qtsvg-opensource-src-5.5.1.tar.xz"; }; }; - qtmultimedia = { + qttools = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtmultimedia-opensource-src-5.5.1.tar.xz"; - sha256 = "0zwmgmiix56c567qw5xnijd1y43mbjg4jw1n624c31qmyjcwmivw"; - name = "qtmultimedia-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttools-opensource-src-5.5.1.tar.xz"; + sha256 = "1zbvr039sv0jzd41ngarxif6954bl50pha8814b5hw3i977gcqa3"; + name = "qttools-opensource-src-5.5.1.tar.xz"; }; }; - qtcanvas3d = { + qttranslations = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtcanvas3d-opensource-src-5.5.1.tar.xz"; - sha256 = "105hl3mvsdif416l4dvpxl7r1iw42if8hhrnji8hf4fp6081g6vm"; - name = "qtcanvas3d-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qttranslations-opensource-src-5.5.1.tar.xz"; + sha256 = "1im4qzpyp1wqrrrlwc4r56b46w5y4bxg2m0y7wkcmihb1xqh1y21"; + name = "qttranslations-opensource-src-5.5.1.tar.xz"; }; }; - qtsensors = { + qtwayland = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsensors-opensource-src-5.5.1.tar.xz"; - sha256 = "1spfr2pn8zz5vz3qz9lzs0wfshmim6hdgf2fpmwpcpcsfb04y9jx"; - name = "qtsensors-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwayland-opensource-src-5.5.1.tar.xz"; + sha256 = "19nxifpg9q785ahzaii2fd2911cg5m0dpk5v041sylm997f4p063"; + name = "qtwayland-opensource-src-5.5.1.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.5.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebchannel-opensource-src-5.5.1.tar.xz"; + sha256 = "1l0m5xjxg5va9dwvgf52r52inl4dl3954d16rfiwnkndazp9ahkz"; + name = "qtwebchannel-opensource-src-5.5.1.tar.xz"; }; }; qtwebengine = { @@ -218,44 +210,52 @@ name = "qtwebengine-opensource-src-5.5.1.tar.xz"; }; }; - qtdeclarative = { + qtwebkit-examples = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdeclarative-opensource-src-5.5.1.tar.xz"; - sha256 = "14b7naaa0rk4q6cxf0w62gvamxk812kr65k82zxkdzrzp3plxlaz"; - name = "qtdeclarative-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-examples-opensource-src-5.5.1.tar.xz"; + sha256 = "1ij65v3nzh5f6rdq43w6vmljjgfw1vky8dd6s4kr093d5ns3b289"; + name = "qtwebkit-examples-opensource-src-5.5.1.tar.xz"; }; }; - qtactiveqt = { + qtwebkit = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtactiveqt-opensource-src-5.5.1.tar.xz"; - sha256 = "09dz5jj7gxa9ds2gw6xw8lacmv27ydhi64370q1ncc7khd0p6g3m"; - name = "qtactiveqt-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebkit-opensource-src-5.5.1.tar.xz"; + sha256 = "0sbdglcf57lmgbcybimvvbpqikn3blb1pxvd71sdhsiypnfkyn3p"; + name = "qtwebkit-opensource-src-5.5.1.tar.xz"; }; }; - qtsvg = { + qtwebsockets = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtsvg-opensource-src-5.5.1.tar.xz"; - sha256 = "1iwibbh835cpxbfh7rnrpvl9k20valr6h256np59rzdy92z8ixgp"; - name = "qtsvg-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwebsockets-opensource-src-5.5.1.tar.xz"; + sha256 = "1srdn668z62j95q1wwhg6xk2dic407r4wl5yi1qk743vhr586kng"; + name = "qtwebsockets-opensource-src-5.5.1.tar.xz"; }; }; - qtdoc = { + qtwinextras = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtdoc-opensource-src-5.5.1.tar.xz"; - sha256 = "11hgw1i1qm2yqzfyg0jsvjda9092hjas35l0bmxn6pvnl5asy3cz"; - name = "qtdoc-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtwinextras-opensource-src-5.5.1.tar.xz"; + sha256 = "07w5ipiwvvapasjswk0g4ndcp0lq65pz2n6l348zwfb0gand406b"; + name = "qtwinextras-opensource-src-5.5.1.tar.xz"; }; }; - qtenginio = { + qtx11extras = { version = "5.5.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtenginio-opensource-src-5.5.1.tar.xz"; - sha256 = "1qpg9pcniqp5xxi2qrc6indqdyn850djk0njiniandbabfykd6d7"; - name = "qtenginio-opensource-src-5.5.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtx11extras-opensource-src-5.5.1.tar.xz"; + sha256 = "0rgbxgp5l212c4vg8z685zv008j9s03mx8p576ny2qibjwfs11v3"; + name = "qtx11extras-opensource-src-5.5.1.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.5.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.5/5.5.1/submodules/qtxmlpatterns-opensource-src-5.5.1.tar.xz"; + sha256 = "1v78s0jygg83yzyldwms8zb72cwp718cc5ialc2ki3lqa81fndxm"; + name = "qtxmlpatterns-opensource-src-5.5.1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 5276bcb73dc..1f03b138f25 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -95,6 +95,7 @@ let /* qtwayland = not packaged */ qtwebchannel = callPackage ./qtwebchannel.nix {}; qtwebengine = callPackage ./qtwebengine.nix {}; + qtwebkit = callPackage ./qtwebkit {}; qtwebsockets = callPackage ./qtwebsockets.nix {}; /* qtwinextras = not packaged */ qtx11extras = callPackage ./qtx11extras.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 82b54ebd3a1..6c52b29b35e 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation { -rpath -optimized-qmake -strip - -reduce-relocations + -no-reduce-relocations -system-proxies -pkg-config diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh index 6d8989281eb..30491983114 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh @@ -61,11 +61,6 @@ _qtMultioutDevs() { preFixupHooks+=(_qtMultioutDevs) -if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" - export NIX_QT_PIC=1 -fi - _qtSetCMakePrefix() { export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" } diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0001-dlopen-webkit-nsplugin.patch new file mode 100644 index 00000000000..0eeacce1bc0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0001-dlopen-webkit-nsplugin.patch @@ -0,0 +1,53 @@ +From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:18:54 -0500 +Subject: [PATCH 1/3] dlopen webkit nsplugin + +--- + Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- + Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- + Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index a923d49..2731d05 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2f..363bde5 100644 +--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff6..62a2197 100644 +--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,7 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0002-dlopen-webkit-gtk.patch new file mode 100644 index 00000000000..bb5d1f74364 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0002-dlopen-webkit-gtk.patch @@ -0,0 +1,25 @@ +From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:19:16 -0500 +Subject: [PATCH 2/3] dlopen webkit gtk + +--- + Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de6521..0b25748 100644 +--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + static bool initializeGtk() + { +- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch new file mode 100644 index 00000000000..1c360cd81aa --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch @@ -0,0 +1,31 @@ +From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:19:29 -0500 +Subject: [PATCH 3/3] dlopen webkit udev + +--- + Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp +index 60ff317..da8ac69 100644 +--- a/Source/WebCore/platform/qt/GamepadsQt.cpp ++++ b/Source/WebCore/platform/qt/GamepadsQt.cpp +@@ -111,12 +111,12 @@ private: + bool load() + { + m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); + m_loaded = m_libUdev.load(); + if (resolveMethods()) + return true; + +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); + m_loaded = m_libUdev.load(); + return resolveMethods(); + } +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix new file mode 100644 index 00000000000..a7953eb5901 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix @@ -0,0 +1,35 @@ +{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors +, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, sqlite, libudev, glib, gst_all_1 +, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby +, substituteAll +, flashplayerFix ? false +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebkit"; + qtInputs = [ qtdeclarative qtlocation qtsensors ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + nativeBuildInputs = [ + bison2 flex gdb gperf perl pkgconfig python ruby + ]; + patches = + let dlopen-webkit-nsplugin = substituteAll { + src = ./0001-dlopen-webkit-nsplugin.patch; + gtk = gtk.out; + gdk_pixbuf = gdk_pixbuf.out; + }; + dlopen-webkit-gtk = substituteAll { + src = ./0002-dlopen-webkit-gtk.patch; + gtk = gtk.out; + }; + dlopen-webkit-udev = substituteAll { + src = ./0003-dlopen-webkit-udev.patch; + libudev = libudev.out; + }; + in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] + ++ [ dlopen-webkit-udev ]; + meta.maintainers = with stdenv.lib.maintainers; [ abbradar ]; +} diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix index 42b688e6e8d..c6deca1150d 100644 --- a/pkgs/development/libraries/qt-5/5.6/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix @@ -1,125 +1,133 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by manifest.sh { fetchurl, mirror }: { - qtxmlpatterns = { - version = "5.6.1-1"; + qtwebkit = { + version = "5.6.1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1966rrk7f6c55k57j33rffdjs77kk4mawrnnl8yv1ckcirxc3np1"; - name = "qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/community_releases/5.6/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz"; + sha256 = "1akjqvjavl0vn8a8hnmvqc26mf4ljvwjdm07x6dmmdnjzajvzkzm"; + name = "qtwebkit-opensource-src-5.6.1.tar.xz"; }; }; - qtx11extras = { + qt3d = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtx11extras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0yj5yg2dqkrwbgbicmk2rpqsagmi8dsffkrprpsj0fmkx4awhv5y"; - name = "qtx11extras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qt3d-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1nxpcjsarcp40m4y18kyy9a5md56wnafll03j8c6q19rba9bcwbf"; + name = "qt3d-opensource-src-5.6.1-1.tar.xz"; }; }; - qtwinextras = { + qtactiveqt = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwinextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "03zkwqrix2nfqkwfn8lsrpgahzx1hv6p1qbvhkqymzakkzjjncgg"; - name = "qtwinextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtactiveqt-opensource-src-5.6.1-1.tar.xz"; + sha256 = "00bj9c0x3ax34gpibaap3wpchkv4wapsydiz01fb0xzs1fy94nbf"; + name = "qtactiveqt-opensource-src-5.6.1-1.tar.xz"; }; }; - qtwebview = { + qtandroidextras = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebview-opensource-src-5.6.1-1.tar.xz"; - sha256 = "19954snfw073flxn0qk5ayxyzk5x6hwhpg4kn4nrl1zygsw3y49l"; - name = "qtwebview-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtandroidextras-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0xhm4053y9hqnz5y3y4rwycniq0mb1al1rds3jx636211y039xhk"; + name = "qtandroidextras-opensource-src-5.6.1-1.tar.xz"; }; }; - qtwebsockets = { + qtbase = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebsockets-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1fz0x8570zxc00a22skd848svma3p2g3xyxj14jq10559jihqqil"; - name = "qtwebsockets-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtbase-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0fbwprlhqmdyhh2wb9122fcpq7pbil530iak482b9sy5gqs7i5ij"; + name = "qtbase-opensource-src-5.6.1-1.tar.xz"; }; }; - qtwebengine = { + qtcanvas3d = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0k708a34zwkj6hwx3vv5kdvnv3lfgb0iad44zaim5gdpgcir03n8"; - name = "qtwebengine-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; + sha256 = "13127xws6xfkkk1x617bgdzl96l66nd0v82dibdnxnpfa702rl44"; + name = "qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; }; }; - qtwebchannel = { + qtconnectivity = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebchannel-opensource-src-5.6.1-1.tar.xz"; - sha256 = "10kys3ppjkj60fs1s335fdcpdsbxsjn6ibvm6zph9gqbncabd2l7"; - name = "qtwebchannel-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtconnectivity-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0sr6sxp0q45pacs25knr28139xdrphcjgrwlksdhdpsryfw19mzi"; + name = "qtconnectivity-opensource-src-5.6.1-1.tar.xz"; }; }; - qtwayland = { + qtdeclarative = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwayland-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1fnvgpi49ilds3ah9iizxj9qhhb5rnwqd9h03bhkwf0ydywv52c4"; - name = "qtwayland-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-opensource-src-5.6.1-1.tar.xz"; + sha256 = "094gx5mzqzcga97y7ihf052b6i5iv512lh7m0702m5q94nsn1pqw"; + name = "qtdeclarative-opensource-src-5.6.1-1.tar.xz"; }; }; - qttranslations = { + qtdeclarative-render2d = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttranslations-opensource-src-5.6.1-1.tar.xz"; - sha256 = "03sdzci4pgq6lmxwn25v8x0z5x8g7zgpq2as56dqgj7vp6cvhn8m"; - name = "qttranslations-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0kqmb3792rg9fx12m64x87ahcrh0g9krg77mv0ssx3g4gvsgcibc"; + name = "qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; }; }; - qttools = { + qtdoc = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttools-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0haic027a2d7p7k8xz83fbvci4a4dln34360rlwgy7hlyy5m4nip"; - name = "qttools-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdoc-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1yf3g3h72ndrp88h8g21mzgqdz2ixwkvpav03i3jnrgy2pf7nssp"; + name = "qtdoc-opensource-src-5.6.1-1.tar.xz"; }; }; - qtsvg = { + qtenginio = { + version = "1.6.1"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtenginio-opensource-src-1.6.1.tar.xz"; + sha256 = "17hsrhzy9zdvpbzja45aac6jr7jzzjl206vma96b9w73rbgxa50f"; + name = "qtenginio-opensource-src-1.6.1.tar.xz"; + }; + }; + qtgraphicaleffects = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsvg-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1w0jvhgaiddafcms2nv8wl1klg07lncmjwm1zhdw3l6rxi9071sw"; - name = "qtsvg-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0560800fa9sd6dw1vk0ia9vq8ywdrwch2cpsi1vmh4iyxgwfr71b"; + name = "qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; }; }; - qtserialport = { + qtimageformats = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialport-opensource-src-5.6.1-1.tar.xz"; - sha256 = "135cbgghxk0c6dblmyyrw6znfb9m8sac9hhyc2dm6vq7vzy8id52"; - name = "qtserialport-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtimageformats-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1p98acvsm3azka2by1ph4gdb31qbnndrr5k5wns4xk2d760y8ifc"; + name = "qtimageformats-opensource-src-5.6.1-1.tar.xz"; }; }; - qtserialbus = { + qtlocation = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialbus-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0li4g70s5vfb517ag0d6405ymsknvvny1c8x66w7qs8a8mnk1jq5"; - name = "qtserialbus-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtlocation-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0my4pbcxa58yzvdh65l5qx99ln03chjr5c3ml5v37wfk7nx23k69"; + name = "qtlocation-opensource-src-5.6.1-1.tar.xz"; }; }; - qtsensors = { + qtmacextras = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsensors-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0kcrvf6vzn6g2v2m70f9r3raalzmfp48rwjlqhss3w84jfz3y04r"; - name = "qtsensors-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmacextras-opensource-src-5.6.1-1.tar.xz"; + sha256 = "07j26d5g7av4c6alggg5hssqpvdh555zmn1cpr8xrhx1hpbdnaas"; + name = "qtmacextras-opensource-src-5.6.1-1.tar.xz"; }; }; - qtscript = { + qtmultimedia = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtscript-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1gini9483flqa9q4a4bl81bh7g5s408bycqykqhgbklmfd29y5lx"; - name = "qtscript-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmultimedia-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0paffx0614ivjbf87lr9klpbqik6r1pzbc14l41np6d9jv3dqa2f"; + name = "qtmultimedia-opensource-src-5.6.1-1.tar.xz"; }; }; qtquickcontrols2 = { @@ -138,124 +146,124 @@ name = "qtquickcontrols-opensource-src-5.6.1-1.tar.xz"; }; }; - qtmultimedia = { + qtscript = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmultimedia-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0paffx0614ivjbf87lr9klpbqik6r1pzbc14l41np6d9jv3dqa2f"; - name = "qtmultimedia-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtscript-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1gini9483flqa9q4a4bl81bh7g5s408bycqykqhgbklmfd29y5lx"; + name = "qtscript-opensource-src-5.6.1-1.tar.xz"; }; }; - qtmacextras = { + qtsensors = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtmacextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "07j26d5g7av4c6alggg5hssqpvdh555zmn1cpr8xrhx1hpbdnaas"; - name = "qtmacextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsensors-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0kcrvf6vzn6g2v2m70f9r3raalzmfp48rwjlqhss3w84jfz3y04r"; + name = "qtsensors-opensource-src-5.6.1-1.tar.xz"; }; }; - qtlocation = { + qtserialbus = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtlocation-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0my4pbcxa58yzvdh65l5qx99ln03chjr5c3ml5v37wfk7nx23k69"; - name = "qtlocation-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialbus-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0li4g70s5vfb517ag0d6405ymsknvvny1c8x66w7qs8a8mnk1jq5"; + name = "qtserialbus-opensource-src-5.6.1-1.tar.xz"; }; }; - qtimageformats = { + qtserialport = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtimageformats-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1p98acvsm3azka2by1ph4gdb31qbnndrr5k5wns4xk2d760y8ifc"; - name = "qtimageformats-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtserialport-opensource-src-5.6.1-1.tar.xz"; + sha256 = "135cbgghxk0c6dblmyyrw6znfb9m8sac9hhyc2dm6vq7vzy8id52"; + name = "qtserialport-opensource-src-5.6.1-1.tar.xz"; }; }; - qtgraphicaleffects = { + qtsvg = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0560800fa9sd6dw1vk0ia9vq8ywdrwch2cpsi1vmh4iyxgwfr71b"; - name = "qtgraphicaleffects-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtsvg-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1w0jvhgaiddafcms2nv8wl1klg07lncmjwm1zhdw3l6rxi9071sw"; + name = "qtsvg-opensource-src-5.6.1-1.tar.xz"; }; }; - qtenginio = { - version = "1.6.1"; + qttools = { + version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtenginio-opensource-src-1.6.1.tar.xz"; - sha256 = "17hsrhzy9zdvpbzja45aac6jr7jzzjl206vma96b9w73rbgxa50f"; - name = "qtenginio-opensource-src-1.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttools-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0haic027a2d7p7k8xz83fbvci4a4dln34360rlwgy7hlyy5m4nip"; + name = "qttools-opensource-src-5.6.1-1.tar.xz"; }; }; - qtdoc = { + qttranslations = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdoc-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1yf3g3h72ndrp88h8g21mzgqdz2ixwkvpav03i3jnrgy2pf7nssp"; - name = "qtdoc-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qttranslations-opensource-src-5.6.1-1.tar.xz"; + sha256 = "03sdzci4pgq6lmxwn25v8x0z5x8g7zgpq2as56dqgj7vp6cvhn8m"; + name = "qttranslations-opensource-src-5.6.1-1.tar.xz"; }; }; - qtdeclarative-render2d = { + qtwayland = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0kqmb3792rg9fx12m64x87ahcrh0g9krg77mv0ssx3g4gvsgcibc"; - name = "qtdeclarative-render2d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwayland-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1fnvgpi49ilds3ah9iizxj9qhhb5rnwqd9h03bhkwf0ydywv52c4"; + name = "qtwayland-opensource-src-5.6.1-1.tar.xz"; }; }; - qtdeclarative = { + qtwebchannel = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtdeclarative-opensource-src-5.6.1-1.tar.xz"; - sha256 = "094gx5mzqzcga97y7ihf052b6i5iv512lh7m0702m5q94nsn1pqw"; - name = "qtdeclarative-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebchannel-opensource-src-5.6.1-1.tar.xz"; + sha256 = "10kys3ppjkj60fs1s335fdcpdsbxsjn6ibvm6zph9gqbncabd2l7"; + name = "qtwebchannel-opensource-src-5.6.1-1.tar.xz"; }; }; - qtconnectivity = { + qtwebengine = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtconnectivity-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0sr6sxp0q45pacs25knr28139xdrphcjgrwlksdhdpsryfw19mzi"; - name = "qtconnectivity-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebengine-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0k708a34zwkj6hwx3vv5kdvnv3lfgb0iad44zaim5gdpgcir03n8"; + name = "qtwebengine-opensource-src-5.6.1-1.tar.xz"; }; }; - qtcanvas3d = { + qtwebsockets = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "13127xws6xfkkk1x617bgdzl96l66nd0v82dibdnxnpfa702rl44"; - name = "qtcanvas3d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebsockets-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1fz0x8570zxc00a22skd848svma3p2g3xyxj14jq10559jihqqil"; + name = "qtwebsockets-opensource-src-5.6.1-1.tar.xz"; }; }; - qtbase = { + qtwebview = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtbase-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0fbwprlhqmdyhh2wb9122fcpq7pbil530iak482b9sy5gqs7i5ij"; - name = "qtbase-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwebview-opensource-src-5.6.1-1.tar.xz"; + sha256 = "19954snfw073flxn0qk5ayxyzk5x6hwhpg4kn4nrl1zygsw3y49l"; + name = "qtwebview-opensource-src-5.6.1-1.tar.xz"; }; }; - qtandroidextras = { + qtwinextras = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtandroidextras-opensource-src-5.6.1-1.tar.xz"; - sha256 = "0xhm4053y9hqnz5y3y4rwycniq0mb1al1rds3jx636211y039xhk"; - name = "qtandroidextras-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtwinextras-opensource-src-5.6.1-1.tar.xz"; + sha256 = "03zkwqrix2nfqkwfn8lsrpgahzx1hv6p1qbvhkqymzakkzjjncgg"; + name = "qtwinextras-opensource-src-5.6.1-1.tar.xz"; }; }; - qtactiveqt = { + qtx11extras = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtactiveqt-opensource-src-5.6.1-1.tar.xz"; - sha256 = "00bj9c0x3ax34gpibaap3wpchkv4wapsydiz01fb0xzs1fy94nbf"; - name = "qtactiveqt-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtx11extras-opensource-src-5.6.1-1.tar.xz"; + sha256 = "0yj5yg2dqkrwbgbicmk2rpqsagmi8dsffkrprpsj0fmkx4awhv5y"; + name = "qtx11extras-opensource-src-5.6.1-1.tar.xz"; }; }; - qt3d = { + qtxmlpatterns = { version = "5.6.1-1"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qt3d-opensource-src-5.6.1-1.tar.xz"; - sha256 = "1nxpcjsarcp40m4y18kyy9a5md56wnafll03j8c6q19rba9bcwbf"; - name = "qt3d-opensource-src-5.6.1-1.tar.xz"; + url = "${mirror}/official_releases/qt/5.6/5.6.1-1/submodules/qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; + sha256 = "1966rrk7f6c55k57j33rffdjs77kk4mawrnnl8yv1ckcirxc3np1"; + name = "qtxmlpatterns-opensource-src-5.6.1-1.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix index a84a429695c..aa2cbb92169 100644 --- a/pkgs/development/libraries/qt-5/5.7/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -90,6 +90,7 @@ let qttranslations = callPackage ./qttranslations.nix {}; qtwebchannel = callPackage ./qtwebchannel.nix {}; qtwebengine = callPackage ./qtwebengine.nix {}; + qtwebkit = callPackage ./qtwebkit {}; qtwebsockets = callPackage ./qtwebsockets.nix {}; qtx11extras = callPackage ./qtx11extras.nix {}; qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index 94ddb21f3b6..f9d56612375 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation { -rpath -optimized-qmake -strip - -reduce-relocations + -no-reduce-relocations -system-proxies -pkg-config diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh index 6d8989281eb..30491983114 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh @@ -61,11 +61,6 @@ _qtMultioutDevs() { preFixupHooks+=(_qtMultioutDevs) -if [[ -z "$NIX_QT_PIC" ]]; then - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" - export NIX_QT_PIC=1 -fi - _qtSetCMakePrefix() { export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" } diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch new file mode 100644 index 00000000000..0eeacce1bc0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0001-dlopen-webkit-nsplugin.patch @@ -0,0 +1,53 @@ +From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:18:54 -0500 +Subject: [PATCH 1/3] dlopen webkit nsplugin + +--- + Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- + Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- + Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index a923d49..2731d05 100644 +--- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2f..363bde5 100644 +--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff6..62a2197 100644 +--- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,7 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch new file mode 100644 index 00000000000..bb5d1f74364 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0002-dlopen-webkit-gtk.patch @@ -0,0 +1,25 @@ +From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:19:16 -0500 +Subject: [PATCH 2/3] dlopen webkit gtk + +--- + Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de6521..0b25748 100644 +--- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + static bool initializeGtk() + { +- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch new file mode 100644 index 00000000000..1c360cd81aa --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/0003-dlopen-webkit-udev.patch @@ -0,0 +1,31 @@ +From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:19:29 -0500 +Subject: [PATCH 3/3] dlopen webkit udev + +--- + Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp +index 60ff317..da8ac69 100644 +--- a/Source/WebCore/platform/qt/GamepadsQt.cpp ++++ b/Source/WebCore/platform/qt/GamepadsQt.cpp +@@ -111,12 +111,12 @@ private: + bool load() + { + m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); + m_loaded = m_libUdev.load(); + if (resolveMethods()) + return true; + +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); + m_loaded = m_libUdev.load(); + return resolveMethods(); + } +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix new file mode 100644 index 00000000000..a7953eb5901 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix @@ -0,0 +1,35 @@ +{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors +, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, sqlite, libudev, glib, gst_all_1 +, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby +, substituteAll +, flashplayerFix ? false +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebkit"; + qtInputs = [ qtdeclarative qtlocation qtsensors ]; + buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + nativeBuildInputs = [ + bison2 flex gdb gperf perl pkgconfig python ruby + ]; + patches = + let dlopen-webkit-nsplugin = substituteAll { + src = ./0001-dlopen-webkit-nsplugin.patch; + gtk = gtk.out; + gdk_pixbuf = gdk_pixbuf.out; + }; + dlopen-webkit-gtk = substituteAll { + src = ./0002-dlopen-webkit-gtk.patch; + gtk = gtk.out; + }; + dlopen-webkit-udev = substituteAll { + src = ./0003-dlopen-webkit-udev.patch; + libudev = libudev.out; + }; + in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] + ++ [ dlopen-webkit-udev ]; + meta.maintainers = with stdenv.lib.maintainers; [ abbradar ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix index 38334fa77f1..e7710ce82d6 100644 --- a/pkgs/development/libraries/qt-5/5.7/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.7/srcs.nix @@ -2,6 +2,14 @@ { fetchurl, mirror }: { + qtwebkit = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/community_releases/5.7/5.7.0/qtwebkit-opensource-src-5.7.0.tar.xz"; + sha256 = "1prlpl3zslzpr1iv7m3irvxjxn3v8nlxh21v9k2kaq4fpwy2b8y7"; + name = "qtwebkit-opensource-src-5.7.0.tar.xz"; + }; + }; qt3d = { version = "5.7.0"; src = fetchurl { @@ -146,14 +154,6 @@ name = "qtpurchasing-opensource-src-5.7.0.tar.xz"; }; }; - qtquickcontrols = { - version = "5.7.0"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols-opensource-src-5.7.0.tar.xz"; - sha256 = "0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq"; - name = "qtquickcontrols-opensource-src-5.7.0.tar.xz"; - }; - }; qtquickcontrols2 = { version = "5.7.0"; src = fetchurl { @@ -162,6 +162,14 @@ name = "qtquickcontrols2-opensource-src-5.7.0.tar.xz"; }; }; + qtquickcontrols = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols-opensource-src-5.7.0.tar.xz"; + sha256 = "0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq"; + name = "qtquickcontrols-opensource-src-5.7.0.tar.xz"; + }; + }; qtscript = { version = "5.7.0"; src = fetchurl { diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix new file mode 100644 index 00000000000..fbb2ffdd83b --- /dev/null +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, qmakeHook, qtwebkit, hunspell }: + +stdenv.mkDerivation { + name = "qtwebkit-plugins-2015-05-09"; + + src = fetchFromGitHub { + owner = "QupZilla"; + repo = "qtwebkit-plugins"; + rev = "4e2e0402abd847346bec704be5305ba849eb754b"; + sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m"; + }; + + nativeBuildInputs = [ qmakeHook ]; + + buildInputs = [ qtwebkit hunspell ]; + + postPatch = '' + sed -i "s,-lhunspell,-lhunspell-1.3," src/spellcheck/spellcheck.pri + sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro + ''; + + meta = with stdenv.lib; { + description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit"; + homepage = "https://github.com/QupZilla/qtwebkit-plugins"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix index 8691009acae..c142514b262 100644 --- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix +++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt ''; - configurePhase = '' - findInputs ${boost} boost_dirs propagated-native-build-inputs + configurePhase = '' + findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p Build pushd Build - export LD_LIBRARY_PATH="${blas}/lib:${nvidia_x11}/lib" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [ blas nvidia_x11 ]}" cmake ../src -DCMAKE_INSTALL_PREFIX=$out \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index f9897e4add3..9ea3a54f2b0 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,17 +1,15 @@ { stdenv, fetchurl, unzip, openblas, gfortran }: stdenv.mkDerivation rec { - version = "3.12.4"; + version = "3.12.6"; name = "ipopt-${version}"; src = fetchurl { url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip"; - sha256 = "0hxmpi3zx5zgv2ijscdvc40xf88hx5if0d9sgch155z70g15wx0l"; + sha256 = "0lx09h1757s5jppwnxwblcjk0biqjxy7yaf3z4vfqbl4rl93avs0"; }; - preConfigure = '' - export CXXDEFS="-DHAVE_RAND -DHAVE_CSTRING -DHAVE_CSTDIO" - ''; + CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ "--with-blas-lib=-lopenblas" diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index bc30716e81f..c1f624f8744 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, openssl, tcl, readline ? null, ncurses ? null }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, readline ? null, ncurses ? null }: assert readline != null -> ncurses != null; -stdenv.mkDerivation { - name = "sqlcipher-3.1.0"; +stdenv.mkDerivation rec { + name = "sqlcipher-${version}"; + version = "3.4.0"; - src = fetchurl { - url = "https://github.com/sqlcipher/sqlcipher/archive/v3.1.0.tar.gz"; - sha256 = "1h54hsl7g6ra955aaqid5wxm93fklx2pxz8abcdwf9md3bpfcn18"; + src = fetchFromGitHub { + owner = "sqlcipher"; + repo = "sqlcipher"; + rev = "v${version}"; + sha256 = "1lwc2m21sax3pnjfqddldbpbwr3b51s91fxz7dd7hf6ly8swnsvp"; }; buildInputs = [ readline ncurses openssl tcl ]; - configureFlags = "--enable-threadsafe --disable-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 ""; + CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ]; + LDFLAGS = lib.optional (readline != null) "-lncurses"; - meta = { + meta = with stdenv.lib; { homepage = http://sqlcipher.net/; description = "Full Database Encryption for SQLite"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 2c7cbe04019..3c40ae247f6 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postInstall = '' + ar qf $out/lib/libtalloc.a bin/default/talloc_[0-9]*.o + ''; + meta = with stdenv.lib; { description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 69d833064ed..e9c9260d8d8 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt -, gobjectIntrospection, valaSupport ? true, vala }: +, gobjectIntrospection, valaSupport ? true, vala_0_23 }: stdenv.mkDerivation rec { name = "telepathy-glib-0.24.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [dbus_glib glib python gobjectIntrospection]; - buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala; + buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala_0_23; preConfigure = '' substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index e3e579eefdb..6c2713c1ebe 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python, dbus_glib, dbus_daemon -, telepathy_farstream, telepathy_glib, pythonDBus, fetchpatch }: +{ stdenv, fetchurl, cmake, qtbase, pkgconfig, pythonPackages, dbus_glib, dbus_daemon +, telepathy_farstream, telepathy_glib, fetchpatch }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python dbus-python; +in stdenv.mkDerivation rec { name = "telepathy-qt-0.9.6.1"; src = fetchurl { @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake pkgconfig python ]; - propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib pythonDBus ]; + propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ]; buildInputs = stdenv.lib.optional doCheck dbus_daemon; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix new file mode 100644 index 00000000000..31404e84d25 --- /dev/null +++ b/pkgs/development/libraries/tntdb/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }: + +stdenv.mkDerivation rec { + version = "1.3"; + name = "tntdb"; + src = fetchurl { + url = "http://www.tntnet.org/download/tntdb-${version}.tar.gz"; + sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9"; + }; + + buildInputs = [ cxxtools postgresql mysql sqlite zlib openssl ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://www.tntnet.org/tntdb.html"; + description = "C++ library which makes accessing SQL databases easy and robust"; + platforms = platforms.linux ; + license = licenses.lgpl21; + maintainers = [ maintainers.juliendehos ]; + }; +} diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix new file mode 100644 index 00000000000..93f4d43e6f6 --- /dev/null +++ b/pkgs/development/libraries/tntnet/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cxxtools, zlib, openssl, zip }: + +stdenv.mkDerivation rec { + version = "2.2.1"; + name = "tntnet"; + src = fetchurl { + url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz"; + sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8"; + }; + + buildInputs = [ cxxtools zlib openssl zip ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://www.tntnet.org/tntnet.html"; + description = "Web server which allows users to develop web applications using C++"; + platforms = platforms.linux ; + license = licenses.lgpl21; + maintainers = [ maintainers.juliendehos ]; + }; +} diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix new file mode 100644 index 00000000000..8700378ae75 --- /dev/null +++ b/pkgs/development/libraries/torch/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot, + libjpeg_turbo, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip}: +stdenv.mkDerivation rec{ + version = "0.0pre20160820"; + name = "torch-${version}"; + buildInputs = [ + luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 + libjpeg_turbo zeromq3 ncurses openssl libpng readline + ]; + src = fetchgit (stdenv.lib.importJSON ./src.json); + configurePhase = '' + ''; + buildPhase = '' + cd .. + export PREFIX=$out + mkdir "$out" + sh install.sh -s + ''; + installPhase = '' + ''; + meta = { + inherit version; + description = ''A scientific computing framework with wide support for machine learning algorithms''; + license = stdenv.lib.licenses.bsd3 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/torch/src.json b/pkgs/development/libraries/torch/src.json new file mode 100644 index 00000000000..37c7a20ce54 --- /dev/null +++ b/pkgs/development/libraries/torch/src.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/torch/distro", + "rev": "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f", + "sha256": "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy", + "fetchSubmodules": true +} diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 59063645232..20e2213e3e7 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -5,24 +5,25 @@ with stdenv.lib; let os = stdenv.lib.optionalString; - majorVersion = "5.10"; - minorVersion = "1"; + majorVersion = "7.0"; + minorVersion = "0"; version = "${majorVersion}.${minorVersion}"; in stdenv.mkDerivation rec { name = "vtk-${os (qtLib != null) "qvtk-"}${version}"; src = fetchurl { - url = "${meta.homepage}files/release/${majorVersion}/vtk-${version}.tar.gz"; - sha256 = "1fxxgsa7967gdphkl07lbfr6dcbq9a72z5kynlklxn7hyp0l18pi"; + url = "${meta.homepage}files/release/${majorVersion}/VTK-${version}.tar.gz"; + sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; }; - # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 - postPatch = "sed '/^#define GL_GLEXT_LEGACY/d' -i ./Rendering/vtkOpenGL.h"; - buildInputs = [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib; + preBuild = '' + export LD_LIBRARY_PATH="$(pwd)/lib"; + ''; + # Shared libraries don't work, because of rpath troubles with the current # nixpkgs camke approach. It wants to call a binary at build time, just # built and requiring one of the shared objects. diff --git a/pkgs/development/libraries/wt/cmake.patch b/pkgs/development/libraries/wt/cmake.patch new file mode 100644 index 00000000000..e7b1f87411d --- /dev/null +++ b/pkgs/development/libraries/wt/cmake.patch @@ -0,0 +1,10 @@ +--- a/CMakeLists.txt 2016-07-13 14:27:26.000000000 +0200 ++++ b/CMakeLists.txt 2016-08-16 12:58:28.135652964 +0200 +@@ -6,6 +6,7 @@ + CMAKE_POLICY(SET CMP0002 OLD) + CMAKE_POLICY(SET CMP0003 OLD) + CMAKE_POLICY(SET CMP0005 OLD) ++ CMAKE_POLICY(SET CMP0037 OLD) + ENDIF(COMMAND CMAKE_POLICY) + + PROJECT(WT) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix new file mode 100644 index 00000000000..e25b23e84ed --- /dev/null +++ b/pkgs/development/libraries/wt/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchFromGitHub, cmake, boost, pkgconfig, doxygen, qt48Full, libharu, + pango, fcgi, firebird, libmysql, postgresql, graphicsmagick, glew, openssl, + pcre }: + +stdenv.mkDerivation rec { + name = "wt"; + version = "3.3.6"; + + src = fetchFromGitHub { + owner = "kdeforche"; + repo = name; + rev = version; + sha256 = "1pvykc969l9cpd0da8bgpi4gr8f6qczrbpprrxamyj1pn0ydzvq3"; + }; + + enableParallelBuilding = true; + + buildInputs = [ cmake boost pkgconfig doxygen qt48Full libharu + pango fcgi firebird libmysql postgresql graphicsmagick glew + openssl pcre ]; + + cmakeFlags = [ + "-DWT_WRASTERIMAGE_IMPLEMENTATION=GraphicsMagick" + "-DWT_CPP_11_MODE=-std=c++11" + "-DGM_PREFIX=${graphicsmagick}" + "-DMYSQL_PREFIX=${libmysql.dev}" + "--no-warn-unused-cli" + ]; + + patches = [ ./cmake.patch ]; # fix a cmake warning; PR sent to upstream + + meta = with stdenv.lib; { + homepage = "https://www.webtoolkit.eu/wt"; + description = "C++ library for developing web applications"; + platforms = platforms.linux ; + license = licenses.gpl2; + maintainers = [ maintainers.juliendehos ]; + }; +} + diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 4ba366be56f..bdc21d72ac3 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation rec { name = "xgboost-${version}"; - version = "2016-05-14"; + version = "0.60"; # needs submodules src = fetchgit { url = "https://github.com/dmlc/xgboost"; - rev = "9c26566eb09733423f821f139938ff4105c3775d"; - sha256 = "1d7lnbwxwakclqqfjwyk9w3wd2clkihdr6ljs5z08ydiaspri093"; + rev = "refs/tags/v${version}"; + sha256 = "0536vfl59n9vlagl1cpdl06c9y19dscwhwdzvi27zk5nc5qb6rdq"; }; - postPatch = "sed '1i#include <cmath>' -i src/tree/param.h"; - enableParallelBuilding = true; installPhase = '' diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index ced0844f3e1..879e1ccaec3 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala +{ stdenv, fetchurl, pkgconfig, glib, sqlite, gnome3, vala_0_23 , intltool, libtool, python, dbus_libs, telepathy_glib , gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ]; buildInputs = [ pkgconfig glib sqlite gnome3.gnome_common intltool - libtool python dbus_libs telepathy_glib vala dbus_glib + libtool python dbus_libs telepathy_glib vala_0_23 dbus_glib gtk3 json_glib librdf_raptor2 pythonPackages.rdflib ]; prePatch = "patchShebangs ."; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index 1896a615ac1..4239dc55e7c 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm -0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \ - --set-rpath ${zlib.out}/lib:${ncurses.out}/lib {} \; + --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 5e4c7e54202..36b40d5a29f 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -71,11 +71,11 @@ stdenv.mkDerivation rec { wrapProgram `pwd`/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} wrapProgram `pwd`/hierarchyviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} # The emulators need additional libraries, which are dynamically loaded => let's wrap them @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service do wrapProgram `pwd`/$i \ - --prefix PATH : ${file}/bin:${glxinfo}/bin \ + --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 1689b2f506f..06d38c700dd 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { sed -i \ -e 's|$(uname -m)|i686|' \ -e 's|export JAVA_HOME=.*|export JAVA_HOME=${jre}|' \ - -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${libXtst}/lib:${glib}/lib:${gtk2}/lib:./x10flasher_lib/linux/lib32|' \ + -e 's|export LD_LIBRARY_PATH=.*|export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ libXtst glib gtk2 ]}:./x10flasher_lib/linux/lib32|' \ FlashTool FlashToolConsole ''; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 2dc1b515c03..26b41a75146 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -1,12 +1,11 @@ -{stdenv, fetchgit, buildOcaml, time, autoconf, automake}: +{ stdenv, fetchzip, buildOcaml, time, autoconf, automake }: buildOcaml rec { name = "bitstring"; version = "f1673f8"; - src = fetchgit { - url = "https://code.google.com/p/bitstring/"; - rev = "f1673f8"; - sha256 = "1lh97qf1b7mq64pxkphr2w91ri5hfwg58cpjb2xd8a453c9jylw4"; + src = fetchzip { + url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/bitstring/source-archive.zip; + sha256 = "03343yggwp3y483zj5axaalxlnl698xrjiv3hmd4c2s05g53iwas"; }; patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ]; diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index 2d24fefa205..021962154bd 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation { createFindlibDestdir = true; + preConfigure = "substituteInPlace Makefile --replace gcc $CC"; + installTargets = [ "find_install" ]; meta = { diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix new file mode 100644 index 00000000000..4fd6589cfb5 --- /dev/null +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, ocaml, findlib, result, opam }: + +let ocaml-version = stdenv.lib.getVersion ocaml; in + +stdenv.mkDerivation rec { + name = "ocaml${ocaml-version}-topkg-${version}"; + version = "0.7.8"; + + src = fetchurl { + url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz"; + sha256 = "029lbmabczpmcgkj53mc20vmpcn3f7rf7xms4xf0nywswfzsash6"; + }; + + nativeBuildInputs = [ opam ]; + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ result ]; + + unpackCmd = "tar xjf ${src}"; + buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build"; + createFindlibDestdir = true; + installPhase = '' + opam-installer --script --prefix=$out topkg.install | sh + mv $out/lib/topkg $out/lib/ocaml/${ocaml-version}/site-lib/ + ''; + + meta = { + homepage = http://erratique.ch/software/topkg; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + description = "A packager for distributing OCaml software"; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 8e497560c68..2f19b2c17ef 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, ocaml, findlib, opam, xmlm}: +{ stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }: let pname = "uucd"; - version = "2.0.0"; + version = "4.0.0"; webpage = "http://erratique.ch/software/${pname}"; ocaml_version = (builtins.parseDrvName ocaml.name).version; in @@ -11,16 +11,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "12lbrrdjwdxfa99pbg344dfkj51lr5d2ispcj7d7lwsqyxy6h57i"; + sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6"; }; - buildInputs = [ ocaml findlib opam xmlm ]; + buildInputs = [ ocaml findlib opam topkg ]; createFindlibDestdir = true; unpackCmd = "tar xjf $src"; - buildPhase = "ocaml ./pkg/build.ml native=true native-dynlink=true"; + inherit (topkg) buildPhase; installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh diff --git a/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch new file mode 100644 index 00000000000..5a1c6746e60 --- /dev/null +++ b/pkgs/development/perl-modules/CatalystXScriptServerStarman-fork-arg.patch @@ -0,0 +1,22 @@ +diff --git a/lib/CatalystX/Script/Server/Starman.pm b/lib/CatalystX/Script/Server/Starman.pm +index 670bd74..7b3bd2e 100644 +--- a/lib/CatalystX/Script/Server/Starman.pm ++++ b/lib/CatalystX/Script/Server/Starman.pm +@@ -9,7 +9,7 @@ our $VERSION = '0.02'; + + extends 'Catalyst::Script::Server'; + +-has '+fork' => ( default => 1, init_arg => undef ); ++has '+fork' => ( default => 1 ); + + has [qw/ keepalive restart restart_delay restart_regex restart_directory/] => ( init_arg => undef, is => 'ro' ); + +@@ -70,7 +70,7 @@ CatalystX::Script::Server::Starman - Replace the development server with Starman + + -d --debug force debug mode + -f --fork handle each request in a new process +- (defaults to false) ++ (defaults to true) + -? --help display this help and exits + -h --host host (defaults to all) + -p --port port (defaults to 3000) diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index efbb1e73787..ca73a473ed5 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -4,16 +4,12 @@ wrapPythonPrograms() { wrapPythonProgramsIn $out "$out $pythonPath" } -# Transforms any binaries generated by the setup.py script, replacing them -# with an executable shell script which will set some environment variables -# and then call into the original binary (which has been given a .wrapped -# suffix). -wrapPythonProgramsIn() { - local dir="$1" - local pythonPath="$2" +# Builds environment variables like PYTHONPATH and PATH walking through closure +# of dependencies. +buildPythonPath() { + local pythonPath="$1" local python="@executable@" local path - local f # Create an empty table of python paths (see doc on _addToPythonPath # for how this is used). Build up the program_PATH and program_PYTHONPATH @@ -21,9 +17,35 @@ wrapPythonProgramsIn() { declare -A pythonPathsSeen=() program_PYTHONPATH= program_PATH= + pythonPathsSeen["@python@"]=1 + addToSearchPath program_PATH @python@/bin for path in $pythonPath; do _addToPythonPath $path done +} + +# Patches a Python script so that it has correct libraries path and executable +# name. +patchPythonScript() { + local f="$1" + + # The magicalSedExpression will invoke a "$(basename "$f")", so + # if you change $f to something else, be sure to also change it + # in pkgs/top-level/python-packages.nix! + # It also uses $program_PYTHONPATH. + sed -i "$f" -re '@magicalSedExpression@' +} + +# Transforms any binaries generated by the setup.py script, replacing them +# with an executable shell script which will set some environment variables +# and then call into the original binary (which has been given a .wrapped +# suffix). +wrapPythonProgramsIn() { + local dir="$1" + local pythonPath="$2" + local f + + buildPythonPath "$pythonPath" # Find all regular files in the output directory that are executable. for f in $(find "$dir" -type f -perm -0100); do @@ -39,16 +61,12 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$f" | grep -qv EGG-INFO/scripts; then echo "wrapping \`$f'..." - # The magicalSedExpression will invoke a "$(basename "$f")", so - # if you change $f to something else, be sure to also change it - # in pkgs/top-level/python-packages.nix! - sed -i "$f" -re '@magicalSedExpression@' + patchPythonScript "$f" # wrapProgram creates the executable shell script described # above. The script will set PYTHONPATH and PATH variables.! # (see pkgs/build-support/setup-hooks/make-wrapper.sh) local -a wrap_args=("$f" - --prefix PYTHONPATH ':' "$program_PYTHONPATH" - --prefix PATH ':' "$program_PATH:$dir/bin") + --prefix PATH ':' "$program_PATH") # Add any additional arguments provided by makeWrapperArgs # argument to buildPythonPackage. diff --git a/pkgs/development/python-modules/libgpuarray/cuda/default.nix b/pkgs/development/python-modules/libgpuarray/cuda/default.nix index 91dfb9b625b..a9c64cd7d7f 100644 --- a/pkgs/development/python-modules/libgpuarray/cuda/default.nix +++ b/pkgs/development/python-modules/libgpuarray/cuda/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { function fixRunPath { p=$(patchelf --print-rpath $1) - patchelf --set-rpath "$p:${cudatoolkit}/lib:${clblas}/lib:${nvidia_x11}/lib" $1 + patchelf --set-rpath "$p:${stdenv.lib.makeLibraryPath [ cudatoolkit clblas nvidia_x11 ]}" $1 } fixRunPath Install/lib/libgpuarray.so diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index c8be20bbe0a..d97a23746fd 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }; preConfigure = '' - findInputs ${boost} boost_dirs propagated-native-build-inputs + findInputs ${boost.dev} boost_dirs propagated-native-build-inputs export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 746cc747d72..0eefce47e96 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, python, pythonPackages, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: +{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }: -let version = "4.11.3"; -in -stdenv.mkDerivation { +let + version = "4.11.3"; + inherit (pythonPackages) python dbus-python sip; +in stdenv.mkDerivation { name = "${python.libPrefix}-PyQt-x11-gpl-${version}"; src = fetchurl { @@ -12,7 +13,7 @@ stdenv.mkDerivation { configurePhase = '' mkdir -p $out - lndir ${pythonDBus} $out + lndir ${dbus-python} $out export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages @@ -21,16 +22,16 @@ stdenv.mkDerivation { configureFlagsArray=( \ --confirm-license --bindir $out/bin \ - --destdir $out/lib/${python.libPrefix}/site-packages \ - --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \ - --dbus=$out/include/dbus-1.0 --verbose) + --destdir $out/${python.sitePackages} \ + --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip/PyQt4 \ + --dbus=${dbus_libs.dev}/include/dbus-1.0 --verbose) ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; - buildInputs = [ pkgconfig makeWrapper qt4 lndir ]; + buildInputs = [ pkgconfig makeWrapper qt4 lndir dbus_libs ]; - propagatedBuildInputs = [ pythonPackages.sip_4_16 python ]; + propagatedBuildInputs = [ sip python ]; postInstall = '' for i in $out/bin/*; do @@ -40,7 +41,10 @@ stdenv.mkDerivation { enableParallelBuilding = true; - passthru.pythonPath = []; + passthru = { + pythonPath = []; + qt = qt4; + }; meta = { description = "Python bindings for Qt"; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 69fb6e266ea..f5ee50a7352 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus +{ stdenv, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, dbus_libs , lndir, makeWrapper, qmakeHook }: let - version = "5.5.1"; + version = "5.6"; + inherit (pythonPackages) python dbus-python sip; in stdenv.mkDerivation { name = "${python.libPrefix}-PyQt-${version}"; @@ -15,13 +16,13 @@ in stdenv.mkDerivation { }; src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz"; - sha256 = "11l3pm0wkwkxzw4n3022iid3yyia5ap4l0ny1m5ngkzzzfafyw0a"; + url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz"; + sha256 = "1qgh42zsr9jppl9k7fcdbhxcd1wrb7wyaj9lng9nxfa19in1lj1f"; }; buildInputs = [ pkgconfig makeWrapper lndir - qtbase qtsvg qtwebkit qmakeHook + qtbase qtsvg qtwebkit dbus_libs qmakeHook ]; propagatedBuildInputs = [ sip python ]; @@ -30,7 +31,7 @@ in stdenv.mkDerivation { runHook preConfigure mkdir -p $out - lndir ${pythonDBus} $out + lndir ${dbus-python} $out export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages @@ -40,12 +41,13 @@ in stdenv.mkDerivation { ${python.executable} configure.py -w \ --confirm-license \ - --dbus=$out/include/dbus-1.0 \ + --dbus=${dbus_libs.dev}/include/dbus-1.0 \ --qmake=$QMAKE \ --no-qml-plugin \ --bindir=$out/bin \ - --destdir=$out/lib/${python.libPrefix}/site-packages \ - --sipdir=$out/share/sip \ + --destdir=$out/${python.sitePackages} \ + --stubsdir=$out/${python.sitePackages}/PyQt5 \ + --sipdir=$out/share/sip/PyQt5 \ --designer-plugindir=$out/plugins/designer runHook postConfigure diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix deleted file mode 100644 index 2861816885f..00000000000 --- a/pkgs/development/python-modules/sip/4.16.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, python, isPyPy }: - -if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.16.6"; - - src = fetchurl { - url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "0lj5f581dkwswlwpg7lbicqf940dvrp8vjbkhmyywd99ynxb4zcc"; - }; - - configurePhase = '' - ${python.executable} ./configure.py \ - -d $out/lib/${python.libPrefix}/site-packages \ - -b $out/bin -e $out/include - ''; - - buildInputs = [ python ]; - - passthru.pythonPath = []; - - meta = with stdenv.lib; { - description = "Creates C++ bindings for Python modules"; - homepage = "http://www.riverbankcomputing.co.uk/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 sander urkud ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 6c455b3bb1b..cbee1867cf6 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,17 +1,14 @@ { stdenv, fetchurl, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15 + name = "sip-4.18.1"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1dv1sdwfmnq481v80k2951amzs9s87d4qhk0hpwrhb1sllh92rh5"; + sha256 = "1452zy3g0qv4fpd9c0y4gq437kn0xf7bbfniibv5n43zpwnpmklv"; }; - configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' - # prevent sip from complaining about python not being built as a framework - sed -i -e 1564,1565d siputils.py - '' + '' + configurePhase = '' ${python.executable} ./configure.py \ -d $out/lib/${python.libPrefix}/site-packages \ -b $out/bin -e $out/include diff --git a/pkgs/development/ruby-modules/gem/gem-post-build.rb b/pkgs/development/ruby-modules/gem/gem-post-build.rb index 4480c525bf1..f0322b67f61 100644 --- a/pkgs/development/ruby-modules/gem/gem-post-build.rb +++ b/pkgs/development/ruby-modules/gem/gem-post-build.rb @@ -7,7 +7,7 @@ ruby = File.join(ENV["ruby"], "bin", RbConfig::CONFIG['ruby_install_name']) out = ENV["out"] bin_path = File.join(ENV["out"], "bin") gem_home = ENV["GEM_HOME"] -gem_path = ENV["GEM_PATH"].split(":") +gem_path = ENV["GEM_PATH"].split(File::PATH_SEPARATOR) install_path = Dir.glob("#{gem_home}/gems/*").first gemspec_path = ARGV[0] @@ -64,11 +64,16 @@ spec.executables.each do |exe| # this file is here to facilitate running it. # -Gem.use_paths "#{gem_home}", #{gem_path.to_s} - require 'rubygems' -load Gem.bin_path(#{spec.name.inspect}, #{exe.inspect}) +Gem.paths = { + 'GEM_PATH' => ( + ENV['GEM_PATH'].to_s.split(File::PATH_SEPARATOR) + + #{([gem_home] + gem_path).to_s} + ).join(File::PATH_SEPARATOR) +} + +load Gem.activate_bin_path(#{spec.name.inspect}, #{exe.inspect}, #{spec.version.to_s.inspect}) EOF end diff --git a/pkgs/development/tools/build-managers/gnustep/make/default.nix b/pkgs/development/tools/build-managers/gnustep/make/default.nix deleted file mode 100644 index 5baa37b93a4..00000000000 --- a/pkgs/development/tools/build-managers/gnustep/make/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl }: - -let version = "2.6.7"; in -stdenv.mkDerivation rec { - name = "gnustep-make-${version}"; - - src = fetchurl { - url = "http://ftpmain.gnustep.org/pub/gnustep/core/${name}.tar.gz"; - sha256 = "1r2is23xdg4qirckb6bd4lynfwnnw5d9522wib3ndk1xgirmfaqi"; - }; - - patchPhase = '' - substituteInPlace GNUmakefile.in \ - --replace which type \ - --replace 'tooldir = $(DESTDIR)' 'tooldir = ' \ - --replace 'makedir = $(DESTDIR)' 'makedir = ' \ - --replace 'mandir = $(DESTDIR)' 'mandir = ' - - substituteInPlace FilesystemLayouts/apple \ - --replace /usr/local "" - - substituteInPlace configure \ - --replace /Library/GNUstep "$out" - ''; - - installFlags = "DESTDIR=$(out)"; - - postInstall = '' - mkdir -p $out/nix-support - cat >$out/nix-support/setup-hook <<EOF - . $out/Library/GNUstep/Makefiles/GNUstep.sh - EOF - ''; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/development/tools/build-managers/gnustep/xcode/default.nix b/pkgs/development/tools/build-managers/gnustep/xcode/default.nix deleted file mode 100644 index 4f31c6df6d8..00000000000 --- a/pkgs/development/tools/build-managers/gnustep/xcode/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchgit, gnustep-make, Foundation, libobjc }: - -stdenv.mkDerivation rec { - name = "xcode-${version}"; - version = "1.0"; - - makeFlags = "messages=yes"; - - installFlags = "DESTDIR=$(out)"; - - __impureHostDeps = [ - "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation" - "/usr/lib/libextension.dylib" - ]; - - buildInputs = [ gnustep-make Foundation libobjc ]; - - src = fetchgit { - url = "https://github.com/gnustep/xcode"; - rev = "cc5016794e44f9998674120a5e4625aa09ca455a"; - sha256 = "85420f3f61091b2e4548cf5e99d886cb9c72cf07b8b9fae3eebc87e7b6b7e54a"; - }; -} diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 07cdf3fbd6d..86058e03e41 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -51,7 +51,16 @@ rec { }; }; - gradleLatest = gradleGen rec { + gradle_latest = gradleGen rec { + name = "gradle-3.0"; + + src = fetchurl { + url = "http://services.gradle.org/distributions/${name}-bin.zip"; + sha256 = "103z2nzlpc6x3mav0mqardd84rj1si718f6wpnpl8i273aa0dj9r"; + }; + }; + + gradle_2_14 = gradleGen rec { name = "gradle-2.14.1"; src = fetchurl { @@ -60,7 +69,7 @@ rec { }; }; - gradle25 = gradleGen rec { + gradle_2_5 = gradleGen rec { name = "gradle-2.5"; src = fetchurl { diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh deleted file mode 100644 index f3dd2bf2c93..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -source $stdenv/setup - -mkdir -pv $out/bin $out/share/java - -out_bin=$out/bin/lein - -cp -v $src $out_bin -cp -v $jarsrc "$out/share/java/$name-standalone.jar" - -for p in $patches; -do - patch --verbose $out_bin -p0 < $p -done -chmod -v 755 $out_bin - -patchShebangs $out - -wrapProgram $out_bin \ - --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg1compat}/bin/gpg \ - --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 8a8ab9ba91f..39a39f949a5 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, coreutils, findutils, jdk, rlwrap, gnupg1compat }: +, coreutils, jdk, rlwrap, gnupg1compat }: stdenv.mkDerivation rec { pname = "leiningen"; @@ -17,16 +17,33 @@ stdenv.mkDerivation rec { sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p"; }; - patches = [ ./lein-fix-jar-path.patch ]; + JARNAME = "${name}-standalone.jar"; - inherit rlwrap gnupg1compat findutils coreutils jdk; - - builder = ./builder.sh; + unpackPhase = "true"; buildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ jdk ]; + installPhase = '' + mkdir -p $out/bin $out/share/java + + cp -v $src $out/bin/lein + cp -v $jarsrc $out/share/java/$JARNAME + ''; + + fixupPhase = '' + chmod +x $out/bin/lein + patchShebangs $out/bin/lein + + substituteInPlace $out/bin/lein \ + --replace 'LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar' "LEIN_JAR=$out/share/java/$JARNAME" + + wrapProgram $out/bin/lein \ + --prefix PATH ":" "${stdenv.lib.makeBinPath [ rlwrap coreutils ]}" \ + --set LEIN_GPG ${gnupg1compat}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java + ''; + meta = { homepage = http://leiningen.org/; description = "Project automation for Clojure"; diff --git a/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch b/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch deleted file mode 100644 index f7d5bc4d9a7..00000000000 --- a/pkgs/development/tools/build-managers/leiningen/lein-fix-jar-path.patch +++ /dev/null @@ -1,4 +0,0 @@ -46c47 -< LEIN_JAR=/usr/share/java/leiningen-$LEIN_VERSION-standalone.jar ---- -> LEIN_JAR=$(find $(dirname $0)/../share/java -name *-standalone.jar | head -n 1) diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 5a502a1fb79..8063b674766 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -3,8 +3,8 @@ stdenv.mkDerivation rec { name = "redo-1.2"; src = fetchurl { - url = "http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/${name}.tar.bz2"; - sha256 = "0hfbiljmgl821a0sf7abrfx29f22ahrgs86mrlrm8m95s7387kpp"; + url = "https://jdebp.eu./Repository/freebsd/${name}.tar.gz"; + sha256 = "0qr8plllxfn32r4rgnalzlhcs3b4l8a4ga8ig9v8i5iy1qnfhqnf"; }; nativeBuildInputs = [ perl /* for pod2man */ ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://homepage.ntlworld.com/jonathan.deboynepollard/Softwares/redo.html; + homepage = https://jdebp.eu./Softwares/redo/; description = "A system for building target files from source files"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.vrthra ]; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 302026e59cc..10d4a3f0f28 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/bootstrap.sh \ --replace "#!/bin/bash" "#!$(type -P bash)" wrapProgram $out/bin/buildkite-agent \ - --set PATH '"${openssh}/bin/:${git}/bin:${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:$PATH"' + --set PATH '"${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}:$PATH"' ''; meta = { diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix index 4a64d8bf303..1ed752fb393 100644 --- a/pkgs/development/tools/continuous-integration/cide/default.nix +++ b/pkgs/development/tools/continuous-integration/cide/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin makeWrapper ${env}/bin/cide $out/bin/cide \ - --set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin + --set PATH ${stdenv.lib.makeBinPath [ docker git gnutar gzip ]} ''; meta = with lib; { diff --git a/pkgs/development/tools/deis/deps.json b/pkgs/development/tools/deis/deps.json index a0333247062..b28ce075e81 100644 --- a/pkgs/development/tools/deis/deps.json +++ b/pkgs/development/tools/deis/deps.json @@ -1,10 +1,29 @@ [ { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/docopt/docopt-go", - "golang.org/x/crypto", - "gopkg.in/yaml.v2" - ] + "goPackagePath": "gopkg.in/yaml.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/yaml.v2", + "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", + "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" + } + }, + { + "goPackagePath": "github.com/docopt/docopt-go", + "fetch": { + "type": "git", + "url": "https://github.com/docopt/docopt-go", + "rev": "784ddc588536785e7299f7272f39101f7faccc3f", + "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" + } + }, + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/crypto", + "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", + "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" + } } ] diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json index f6d392ad3ce..ab9d0d39fce 100644 --- a/pkgs/development/tools/go2nix/deps.json +++ b/pkgs/development/tools/go2nix/deps.json @@ -1,9 +1,20 @@ [ - { - "include": "../../libs.json", - "packages": [ - "github.com/Masterminds/vcs", - "github.com/jawher/mow.cli" - ] - } + { + "goPackagePath": "github.com/Masterminds/vcs", + "fetch": { + "type": "git", + "url": "https://github.com/Masterminds/vcs", + "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", + "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" + } + }, + { + "goPackagePath": "github.com/jawher/mow.cli", + "fetch": { + "type": "git", + "url": "https://github.com/jawher/mow.cli", + "rev": "772320464101e904cd51198160eb4d489be9cc49", + "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" + } + } ] diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json index bc1b079376a..387adc6cf06 100644 --- a/pkgs/development/tools/golint/deps.json +++ b/pkgs/development/tools/golint/deps.json @@ -1,8 +1,11 @@ [ - { - "include": "../../libs.json", - "packages": [ - "golang.org/x/tools" - ] - } + { + "goPackagePath": "golang.org/x/tools", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/tools", + "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", + "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" + } + } ] diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json index 76e8fd93aa7..64ae72eb3ed 100644 --- a/pkgs/development/tools/gotools/deps.json +++ b/pkgs/development/tools/gotools/deps.json @@ -1,8 +1,11 @@ [ - { - "include": "../../libs.json", - "packages": [ - "golang.org/x/net" - ] - } + { + "goPackagePath": "golang.org/x/net", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/net", + "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", + "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" + } + } ] diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json index 288b2d9f714..3406194137c 100644 --- a/pkgs/development/tools/gox/deps.json +++ b/pkgs/development/tools/gox/deps.json @@ -1,8 +1,11 @@ [ - { - "include": "../../libs.json", - "packages": [ - "github.com/mitchellh/iochan" - ] - } + { + "goPackagePath": "github.com/mitchellh/iochan", + "fetch": { + "type": "git", + "url": "https://github.com/mitchellh/iochan", + "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77", + "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b" + } + } ] diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 7ec56267f6b..f1a4f219682 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -9,7 +9,7 @@ let ihaskellSh = writeScriptBin "ihaskell-notebook" '' #! ${stdenv.shell} export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH" - export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin" + export PATH="${stdenv.lib.makeBinPath [ ihaskell ihaskellEnv ipython ]}" ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell ''; profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar"; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 8195aea8b38..140ff48db55 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "icestorm-${version}"; - version = "2016.05.21"; + version = "2016.08.18"; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "fb67695a883b29ca670b43ed2733eca9ca161e4d"; - sha256 = "0zsjpz49qr09g33nz4nfi1inshg37y5zdxnv6f8gkwq7x948rh3z"; + rev = "12b2295c9087d94b75e374bb205ae4d76cf17e2f"; + sha256 = "1mmzlqvap6w8n4qzv3idvy51arkgn03692ssplwncy3akjrbsd2b"; }; buildInputs = [ python3 libftdi ]; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix new file mode 100644 index 00000000000..2620a5b7741 --- /dev/null +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk }: + +stdenv.mkDerivation rec { + name = "visualvm-1.3.8"; + + src = fetchzip { + url = "https://java.net/projects/visualvm/downloads/download/release138/visualvm_138.zip"; + sha256 = "09wsi85z1g7bwyfhb37vw0gy3wl0j1cy35aj59rg7067q262gy1y"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + rm bin/visualvm.exe + + substituteInPlace etc/visualvm.conf \ + --replace "#visualvm_jdkhome=" "visualvm_jdkhome=" \ + --replace "/path/to/jdk" "${jdk.home}" \ + --replace 'visualvm_default_options="' 'visualvm_default_options="--laf com.sun.java.swing.plaf.gtk.GTKLookAndFeel -J-Dawt.useSystemAAFontSettings=lcd -J-Dswing.aatext=true ' + + cp -r . $out + + # To get the native LAF, JVM needs to see GTK’s .so-s. + wrapProgram $out/bin/visualvm \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}" + ''; + + meta = with stdenv.lib; { + description = "A visual interface for viewing information about Java applications"; + longDescription = '' + VisualVM is a visual tool integrating several commandline JDK + tools and lightweight profiling capabilities. Designed for both + production and development time use, it further enhances the + capability of monitoring and performance analysis for the Java + SE platform. + ''; + homepage = https://visualvm.java.net/; + license = licenses.gpl2ClasspathPlus; + platforms = platforms.all; + maintainers = with maintainers; [ michalrus ]; + }; +} diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix new file mode 100644 index 00000000000..c80861b2fd7 --- /dev/null +++ b/pkgs/development/tools/leaps/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "leaps-${version}"; + version = "20160626-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "5cf7328a8c498041d2a887e89f22f138498f4621"; + + goPackagePath = "github.com/jeffail/leaps"; + + src = fetchgit { + inherit rev; + url = "https://github.com/jeffail/leaps"; + sha256 = "1qbgz48x9yi0w9yz39zsnnhx5nx2xmrns9v8hx28jah2bvag6sq7"; + fetchSubmodules = false; + }; + + goDeps = ./deps.json; + meta = { + description = "A pair programming tool and library written in Golang"; + homepage = "https://github.com/jeffail/leaps/"; + license = "MIT"; + maintainers = with stdenv.lib.maintainers; [ qknight ]; + meta.platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/tools/leaps/deps.json b/pkgs/development/tools/leaps/deps.json new file mode 100644 index 00000000000..60141d5eeee --- /dev/null +++ b/pkgs/development/tools/leaps/deps.json @@ -0,0 +1,11 @@ +[ + { + "goPackagePath": "golang.org/x/net", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/net", + "rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf", + "sha256": "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w" + } + } +] diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index f3d88361a11..a7d6c42e6af 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/ab{put,build}-sourceforge \ - --prefix PATH ":" "${openssh}/bin:${rsync}/bin" + --prefix PATH ":" "${stdenv.lib.makeBinPath [ openssh rsync ]}" ''; meta = { diff --git a/pkgs/development/tools/misc/distcc/masq.nix b/pkgs/development/tools/misc/distcc/masq.nix index 28b31cbb48d..f3bccde8160 100644 --- a/pkgs/development/tools/misc/distcc/masq.nix +++ b/pkgs/development/tools/misc/distcc/masq.nix @@ -3,10 +3,6 @@ stdenv.mkDerivation { name = "distcc-masq-${gccRaw.name}"; - meta = { - platforms = stdenv.lib.platforms.linux; - }; - phases = [ "installPhase" ]; installPhase = '' mkdir -p $out/bin @@ -40,6 +36,9 @@ stdenv.mkDerivation { ln -sf $bbin/*-as $out/bin/as done fi - ''; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index 72bbe50422c..e7c6b108cdd 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r . "$out/src" mkdir "$out/bin" - wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin" + wrapProgram "$out/src/drush" --prefix PATH : "${stdenv.lib.makeBinPath [ which php bash coreutils ncurses ]}" ln -s "$out/src/drush" "$out/bin/drush" ''; } diff --git a/pkgs/development/tools/misc/indent/default.nix b/pkgs/development/tools/misc/indent/default.nix index b533f6214f3..594bef7e16a 100644 --- a/pkgs/development/tools/misc/indent/default.nix +++ b/pkgs/development/tools/misc/indent/default.nix @@ -7,11 +7,15 @@ stdenv.mkDerivation rec { url = "mirror://gnu/indent/${name}.tar.gz"; sha256 = "0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"; }; - + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|#include <malloc.h>|#include <malloc/malloc.h>|' ./man/texinfo2man.c + ''; + meta = { homepage = https://www.gnu.org/software/indent/; description = "A source code reformatter"; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index f3fe7e40623..3aeacd457dd 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { mv * $out/libexec/kibana/ rm -r $out/libexec/kibana/node makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin" + --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 627a51916cb..827c1d0e67f 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ]; prePatch = '' - sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|g" \ + sed -e "s|/sbin/modprobe|${kmod}/bin/modprobe|g" \ -i src/bin/lttng-sessiond/modprobe.c ''; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index d38c862ecfb..fa77890655e 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { cp -a * $out/ substituteInPlace $out/bin/OpenGrok --replace /bin/uname ${coreutils}/bin/uname wrapProgram $out/bin/OpenGrok \ - --prefix PATH : "${ctags}/bin:${git}/bin" \ + --prefix PATH : "${stdenv.lib.makeBinPath [ ctags git ]}" \ --set JAVA_HOME "${jre}" \ --set OPENGROK_TOMCAT_BASE "/var/tomcat" ''; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 5a56933d3ca..b511b7d1948 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -10,12 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr"; }; - buildInputs = [ python cmake llvmPackages.clang boost makeWrapper ]; + buildInputs = [ python cmake boost makeWrapper ]; propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ]; buildPhase = '' - python build.py --clang-completer --system-libclang --system-boost + export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} + python build.py --clang-completer --system-boost ''; configurePhase = ":"; diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index 0fe4b191e50..09955ca5d70 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "4.2.0"; src = fetchurl rec { - url = "http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; + url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; sha256 = "1g58xcw4641wyisp9wscrkzaqrz0vf123dgy52qq2a3wk7y77hkl"; }; diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 2884b23049a..01fe4b73d6c 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -3,21 +3,16 @@ let deps = import ./deps.nix { inherit fetchurl; }; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "0mk9v4s51jdrrcs78v3cm131pz3fdhjkd4cmmfn1kkcfcpqzw6j8"; - + sha256 = "0w5f10p4d4ppwg2plbbrmqwmi1ycgpaidyajza11c9svka014zrb"; }; in stdenv.mkDerivation rec { name = "pypi2nix-${version}"; srcs = with deps; [ src - pip click - setuptools - zcbuildout - zcrecipeegg requests ]; # six attrs effect ]; buildInputs = [ python zip makeWrapper ]; @@ -26,17 +21,13 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -p $out/pkgs - mv pip-*/pip $out/pkgs/pip mv click-*/click $out/pkgs/click - mv setuptools-*/setuptools $out/pkgs/setuptools - mv zc.buildout-*/src/zc $out/pkgs/zc - mv zc.recipe.egg-*/src/zc/recipe $out/pkgs/zc/recipe # mv six-*/six.py $out/pkgs/ # mv attrs-*/src/attr $out/pkgs/attrs # mv effect-*/effect $out/pkgs/effect mv requests-*/requests $out/pkgs/ - if [ -z "$IN_NIX_SHELL" ]; then + if [ "$IN_NIX_SHELL" != "1" ]; then if [ -e git-export ]; then mv git-export/src/pypi2nix $out/pkgs/pypi2nix else @@ -48,9 +39,9 @@ in stdenv.mkDerivation rec { commonPhase = '' mkdir -p $out/bin - echo "#!${python}/bin/python3" > $out/bin/pypi2nix - echo "import pypi2nix.cli" >> $out/bin/pypi2nix - echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix + echo "#!${python.interpreter}" > $out/bin/pypi2nix + echo "import pypi2nix.cli" >> $out/bin/pypi2nix + echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix chmod +x $out/bin/pypi2nix @@ -81,6 +72,5 @@ in stdenv.mkDerivation rec { homepage = https://github.com/garbas/pypi2nix; description = "A tool that generates nix expressions for your python packages, so you don't have to."; maintainers = with stdenv.lib.maintainers; [ garbas ]; - platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix index 5d6f23c26c0..e67cb51c67c 100644 --- a/pkgs/development/tools/pypi2nix/deps.nix +++ b/pkgs/development/tools/pypi2nix/deps.nix @@ -17,6 +17,9 @@ rec { zcrecipeeggVersion = "2.0.3"; zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4"; + buildoutrequirementsVersion = "0.2.2"; + buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00"; + wheelVersion = "0.29.0"; wheelHash = "555a67e4507cedee23a0deb9651e452f"; @@ -71,6 +74,11 @@ rec { md5 = zcrecipeeggHash; }; + buildoutrequirements = fetchurl { + url = "https://github.com/garbas/buildout.requirements/archive/1e2977e2d254184399401746736d2b17c912b350.tar.gz"; + md5 = buildoutrequirementsHash; + }; + wheel = fetchurl { url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-${wheelVersion}.tar.gz"; md5 = wheelHash; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json index 3b43c0e5ff6..1cc264181c4 100644 --- a/pkgs/development/tools/remarshal/deps.json +++ b/pkgs/development/tools/remarshal/deps.json @@ -1,9 +1,20 @@ [ - { - "include": "../../libs.json", - "packages": [ - "github.com/BurntSushi/toml", - "gopkg.in/yaml.v2" - ] - } + { + "goPackagePath": "gopkg.in/yaml.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/yaml.v2", + "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", + "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" + } + }, + { + "goPackagePath": "github.com/BurntSushi/toml", + "fetch": { + "type": "git", + "url": "https://github.com/BurntSushi/toml", + "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", + "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" + } + } ] diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json index d2a75b9e45b..01c5de1cdc6 100644 --- a/pkgs/development/tools/textql/deps.json +++ b/pkgs/development/tools/textql/deps.json @@ -1,8 +1,11 @@ [ - { - "include": "../../libs.json", - "packages": [ - "github.com/mattn/go-sqlite3" - ] - } + { + "goPackagePath": "github.com/mattn/go-sqlite3", + "fetch": { + "type": "git", + "url": "https://github.com/mattn/go-sqlite3", + "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", + "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" + } + } ] diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index e8438727135..242782161d7 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv -, libxml2, libxslt, coreutils, makeWrapper }: +, libxml2, libxslt, makeWrapper }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -77,6 +77,10 @@ stdenv.mkDerivation rec { ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin + # ruby libs + rm -rf opt/vagrant/embedded/lib + ln -s ${ruby}/lib opt/vagrant/embedded/lib + # libiconv: iconv rm opt/vagrant/embedded/bin/iconv ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin @@ -96,11 +100,6 @@ stdenv.mkDerivation rec { cp -r opt "$out" cp -r usr/bin "$out" wrapProgram "$out/bin/vagrant" --prefix LD_LIBRARY_PATH : "$out/opt/vagrant/embedded/lib" - - substituteInPlace $out/opt/vagrant/embedded/lib/ruby/2.2.0/x86_64-linux/rbconfig.rb \ - --replace '"/bin/mkdir' '"${coreutils}/bin/mkdir' - substituteInPlace $out/opt/vagrant/embedded/lib/ruby/2.2.0/x86_64-linux/rbconfig.rb \ - --replace "'/usr/bin/install" "'${coreutils}/bin/install" ''; preFixup = '' diff --git a/pkgs/development/web/minify/deps.json b/pkgs/development/web/minify/deps.json index 0b2fe810854..0575578b43c 100644 --- a/pkgs/development/web/minify/deps.json +++ b/pkgs/development/web/minify/deps.json @@ -1,15 +1,74 @@ [ { - "include": "../../libs.json", - "packages": [ - "github.com/tdewolff/buffer", - "github.com/tdewolff/parse", - "github.com/tdewolff/strconv", - "github.com/dustin/go-humanize", - "github.com/fsnotify/fsnotify", - "github.com/matryer/try", - "github.com/ogier/pflag", - "golang.org/x/sys" - ] + "goPackagePath": "golang.org/x/sys", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/sys", + "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", + "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" + } + }, + { + "goPackagePath": "github.com/dustin/go-humanize", + "fetch": { + "type": "git", + "url": "https://github.com/dustin/go-humanize", + "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0", + "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0" + } + }, + { + "goPackagePath": "github.com/tdewolff/buffer", + "fetch": { + "type": "git", + "url": "https://github.com/tdewolff/buffer", + "rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5", + "sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl" + } + }, + { + "goPackagePath": "github.com/tdewolff/parse", + "fetch": { + "type": "git", + "url": "https://github.com/tdewolff/parse", + "rev": "34d5c1160d4503da4b456e5094609f2331d6dde3", + "sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v" + } + }, + { + "goPackagePath": "github.com/tdewolff/strconv", + "fetch": { + "type": "git", + "url": "https://github.com/tdewolff/strconv", + "rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3", + "sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp" + } + }, + { + "goPackagePath": "github.com/matryer/try", + "fetch": { + "type": "git", + "url": "https://github.com/matryer/try", + "rev": "93d30e50512f879b73829eb79867df38084bcd31", + "sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f" + } + }, + { + "goPackagePath": "github.com/fsnotify/fsnotify", + "fetch": { + "type": "git", + "url": "https://github.com/fsnotify/fsnotify", + "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", + "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" + } + }, + { + "goPackagePath": "github.com/ogier/pflag", + "fetch": { + "type": "git", + "url": "https://github.com/ogier/pflag", + "rev": "45c278ab3607870051a2ea9040bb85fcb8557481", + "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l" + } } ] diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 6348008ab92..21881fe6a31 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala, ctpl +{ stdenv, pkgconfig, fetchFromGitHub, python, glib, vala_0_28, ctpl , libgee, libsoup, fcgi }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lciwqk4k9sf1hl4drl207g0ydlxl906kx9lx5fqhfb8gwcfqh2g"; }; - buildInputs = [ python pkgconfig glib vala ctpl libgee libsoup fcgi ]; + buildInputs = [ python pkgconfig glib vala_0_28 ctpl libgee libsoup fcgi ]; configurePhase = ''python waf configure --prefix=$out''; |