diff options
Diffstat (limited to 'pkgs')
382 files changed, 16481 insertions, 7195 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix new file mode 100644 index 000000000000..e6c95729c6ec --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; + xt_version = "0.11A"; + version = xt_version; + + src = fetchurl { + url = "https://github.com/bitcoinxt/bitcoinxt/archive/v0.11A.tar.gz"; + sha256 = "129cbqf6bln6rhdk70c6nfwdjk6afvsaaw4xdyp0pnfand8idz7n"; + }; + + buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + miniupnpc utillinux protobuf curl ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ + "--with-boost-libdir=${boost.lib}/lib" + "--with-libcurl-headers=${curl}/include" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system"; + longDescription= '' + Bitcoin XT is an implementation of a Bitcoin full node, based upon the + source code of Bitcoin Core. It is built by taking the latest stable + Core release, applying a series of patches, and then doing deterministic + builds so anyone can check the downloads correspond to the source code. + ''; + homepage = "https://bitcoinxt.software/"; + maintainers = with maintainers; [ jefdaj ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a49e4dc9f909..762ef804f83e 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -5,6 +5,9 @@ rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; + darkcoin = callPackage ./darkcoin.nix { withGui = true; }; darkcoind = callPackage ./darkcoin.nix { withGui = false; }; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 5f6538ec4bcb..4ba086d88482 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.0.60"; src = fetchurl { - url = "mirror://sourceforge/calf/${name}.tar.gz"; + url = "http://calf-studio-gear.org/files/${name}.tar.gz"; sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9"; }; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 410ddb4c6f12..d1828016de31 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch"; - sha256 = "0a04l2607y3swcq9b1apffl1chdwj38jwfiizxcfmdbia4a0qlyg"; + sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599"; }) ]; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 2f236eab4e17..be825c5cdd0e 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,16 +1,45 @@ { stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }: -let version = "1.1.2"; in -stdenv.mkDerivation { +let + + version = "1.2.0"; + rev = "v${version}"; + sha256 = "05w2sqnzxy4lwc0chjlizpxqwc6ni58yz8xcwvp18fq68wa28qvf"; + + reaperFork = { + src = fetchFromGitHub { + sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc"; + rev = "39053e8896eedd7b3e8a9e9a9ffd80f1fc6ceb16"; + repo = "reaper"; + owner = "gillesdegottex"; + }; + meta = with stdenv.lib; { + license = licenses.asl20; + }; + }; + +in stdenv.mkDerivation { name = "dfasma-${version}"; src = fetchFromGitHub { - sha256 = "0xqam5hm4kvfksdlyz1rviijv386fk3px4lhz6glfsimbcvvzl0r"; - rev = "v${version}"; + inherit sha256 rev; repo = "dfasma"; owner = "gillesdegottex"; }; + buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ]; + + postPatch = '' + substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' + cp -Rv "${reaperFork.src}"/* external/REAPER + ''; + + configurePhase = '' + qmake PREFIX=$out PREFIXSHORTCUT=$out dfasma.pro + ''; + + enableParallelBuilding = true; + meta = with stdenv.lib; { inherit version; description = "Analyse and compare audio files in time and frequency"; @@ -23,25 +52,8 @@ stdenv.mkDerivation { amplitude, this software does not aim to be an audio editor. ''; homepage = http://gillesdegottex.github.io/dfasma/; - license = licenses.gpl3Plus; - platforms = with platforms; linux; + license = [ licenses.gpl3Plus reaperFork.meta.license ]; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ]; - - postPatch = '' - substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}' - ''; - - configurePhase = '' - qmake DESTDIR=$out/bin dfasma.pro - ''; - - enableParallelBuilding = true; - - postInstall = '' - install -Dm644 distrib/dfasma.desktop $out/share/applications/dfasma.desktop - install -Dm644 icons/dfasma.png $out/share/pixmaps/dfasma.png - ''; } diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 84ec955de3f3..fe1f4c85c30a 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,11 +1,11 @@ -# FIXME: upgrading qt5Full (Qt 5.3) to qt5.{base,multimedia} (Qt 5.4) breaks -# the default Qt audio capture source! -{ stdenv, fetchFromGitHub, fftw, freeglut, qt5Full -, alsaSupport ? false, alsaLib ? null -, jackSupport ? false, libjack2 ? null }: +{ stdenv, fetchFromGitHub, fftw, freeglut, qt5 +, alsaSupport ? true, alsaLib ? null +, jackSupport ? false, libjack2 ? null +, portaudioSupport ? false, portaudio ? null }: assert alsaSupport -> alsaLib != null; assert jackSupport -> libjack2 != null; +assert portaudioSupport -> portaudio != null; let version = "1.0.8"; in stdenv.mkDerivation { @@ -18,9 +18,10 @@ stdenv.mkDerivation { owner = "gillesdegottex"; }; - buildInputs = [ fftw freeglut qt5Full ] + buildInputs = [ fftw freeglut qt5.base qt5.multimedia ] ++ stdenv.lib.optional alsaSupport [ alsaLib ] - ++ stdenv.lib.optional jackSupport [ libjack2 ]; + ++ stdenv.lib.optional jackSupport [ libjack2 ] + ++ stdenv.lib.optional portaudioSupport [ portaudio ]; configurePhase = '' mkdir build @@ -28,6 +29,7 @@ stdenv.mkDerivation { qmake \ CONFIG+=${stdenv.lib.optionalString alsaSupport "acs_alsa"} \ CONFIG+=${stdenv.lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${stdenv.lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIX="$out" PREFIXSHORTCUT="$out" \ ../fmit.pro ''; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 9046ec0a87fc..8f04bf116a6c 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.katjaas.nl/helmholtz/helmholtz~.zip"; name = "helmholtz.zip"; + curlOpts = "--user-agent ''"; sha256 = "0h1fj7lmvq9j6rmw33rb8k0byxb898bi2xhcwkqalb84avhywgvs"; }; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index ffd920427ac5..c9d9ad57487a 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 -, pkgconfig }: +, pkgconfig, openssl }: stdenv.mkDerivation rec { name = "petri-foo-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs - libsamplerate libsndfile libtool libxml2 pkgconfig + libsamplerate libsndfile libtool libxml2 pkgconfig openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 354a3e43616d..03ba33b4834a 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, alsaLib, gtk, pkgconfig }: -let version = "5401"; in +let version = "5417"; in stdenv.mkDerivation { name = "praat-${version}"; src = fetchurl { url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; - sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3"; + sha256 = "1bspl963pb1s6k3cd9p3g5j518pxg6hkrann945lqsrvbzaa20kl"; }; configurePhase = '' diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix new file mode 100644 index 000000000000..badac0887a1a --- /dev/null +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }: + +stdenv.mkDerivation rec { + version = "0.3.0"; + name = "qmidiroute-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; + sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + }; + + buildInputs = [ pkgconfig qt4 alsaLib ]; + + meta = with stdenv.lib; { + description = "MIDI event processor and router"; + longDescription = '' + qmidiroute is a versatile MIDI event processor and router for the ALSA + sequencer. The graphical interface is based on the Qt4 toolkit. + qmidiroute permits setting up an unlimited number of MIDI maps in which + incoming events are selected, modified or even changed in type before + being directed to a dedicated ALSA output port. The maps work in + parallel, and they are organized in tabs. + ''; + + license = licenses.gpl2; + maintainers = [ maintainers.lebastr ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index b22018f1612c..5ee15a925821 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { libsndfile libsamplerate perl makedepend libjack2 ] ++ stdenv.lib.optional withLirc [ lirc ]; - enableParallelBuilding = true; + #enableParallelBuilding = true; issues on hydra meta = with stdenv.lib; { homepage = http://www.rosegardenmusic.com/; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index fc2f9265ed67..4de862b0254b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.0.0"; + version = "1.0.4"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "434be52726fed9804ddb8c07dba200d774d145d0a870d2a013b5f95eb882fa7e"; + sha256 = "0jki2ca12mazvszy05xc7zy8nfpavl0rnzcyksvvic32l3w2yxj7"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index 6ea9fbfdbb61..2b6dca9039f0 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.5"; - name = "${emacsName}-mac-5.9"; + name = "${emacsName}-mac-5.10"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "1xjskagjlnni1nqshszbvk8h8vhwq9sk09l25vb6fijn4g9akwqr"; + sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf"; }; buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 7d987e73b913..3f1967c70535 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs, python }: stdenv.mkDerivation rec { - name = "cask-0.7.2"; + name = "cask-0.7.3"; src = fetchgit { url = "https://github.com/cask/cask.git"; - rev = "8d667e1ce3f3aa817a7b996f02058b2441f83958"; - sha256 = "08brrdyz7zsw134zwf4dyj6bj2glflszssfq8vya3mh01s38mfri"; + rev = "717b64a9ba7640ec366e8573da0c01f9c4d57b0c"; + sha256 = "0j18rzgpibisfcci6kcgjs8nlkfi1dw33dxp6ab6zaiarydwgcs5"; }; buildInputs = [ emacs python ]; diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index 35f9bd3ceb2a..9a0f6855567c 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -1,12 +1,14 @@ -{stdenv, fetchgit, emacs, colorTheme}: - +{stdenv, fetchzip, emacs, colorTheme}: +let + commit = "412713a0fcedd520d208a7b783fea03d710bcc61"; +in stdenv.mkDerivation rec { - name = "color-theme-6.5.5"; + name = "color-theme-solarized-1.0.0"; + + src = fetchzip { - src = fetchgit { - url = https://github.com/sellout/emacs-color-theme-solarized.git; - rev = "6a2c7ca0181585858e6e8054cb99db837e2ef72f"; - sha256 = "3c46a3d66c75ec4456209eeafdb03282148b289b12e8474f6a8962f3894796e8"; + url = "https://github.com/sellout/emacs-color-theme-solarized/archive/${commit}.zip"; + sha256 = "1xd2yk7p39zxgcf91s80pqknzdxw9d09cppjb87g7ihj6f0wxqjv"; }; buildInputs = [ emacs ]; @@ -25,6 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Precision colors for machines and people"; homepage = http://ethanschoonover.com/solarized; + maintainer = "Samuel Rivas <samuelrivas@gmail.com>"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix index aacc33c9b516..c71860992daf 100644 --- a/pkgs/applications/editors/emacs-modes/dash/default.nix +++ b/pkgs/applications/editors/emacs-modes/dash/default.nix @@ -1,13 +1,14 @@ {stdenv, fetchurl, emacs}: -let version = "1.5.0"; - -in stdenv.mkDerivation { +let + version = "2.11.0"; +in +stdenv.mkDerivation { name = "emacs-dash-${version}"; src = fetchurl { url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz"; - sha256 = "0c6jknzy306vn22vqlabxkwxfnllrd33spymi74fkirbxaxvp8kp"; + sha256 = "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix new file mode 100644 index 000000000000..b2d59ef37b04 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix @@ -0,0 +1,25 @@ +{ stdenv, erlang }: + +stdenv.mkDerivation { + + name = "erlang-mode-${erlang.version}"; + + buildInputs = [ ]; + + inherit erlang; + + buildCommand = '' + mkdir -p "$out/share/emacs/site-lisp" + cp "$erlang/lib/erlang/lib/tools"*/emacs/*.el $out/share/emacs/site-lisp/ + ''; + + # emacs highlighting */ + + meta = { + homepage = "http://github.com/erlang/otp"; + description = "Erlang mode for Emacs"; + licence = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ "Samuel Rivas <samuelrivas@gmail.com>" ]; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/git-modes/default.nix b/pkgs/applications/editors/emacs-modes/git-modes/default.nix index 8a2ca6eb9090..59733fe5bb41 100644 --- a/pkgs/applications/editors/emacs-modes/git-modes/default.nix +++ b/pkgs/applications/editors/emacs-modes/git-modes/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs }: let - version = "0.15.0-8-g4e10851"; + version = "1.2.0"; in stdenv.mkDerivation { name = "git-modes-${version}"; @@ -9,8 +9,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "4e10851843145e0c05fc665683d3b487a57ad114"; - sha256 = "13j794a2p4ql9dnw2z0c1m0ybclxsicbk8cmmfqcchs4ygiyc6ag"; + rev = version; + sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd"; }; buildInputs = [ emacs ]; diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 022827952b69..67d1d71c5ee0 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, emacs, texinfo }: let - version = "13.14-153-g318ccab"; # git describe --tags + version = "13.14-169-g0d3569d"; # git describe --tags in stdenv.mkDerivation { name = "haskell-mode-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { owner = "haskell"; repo = "haskell-mode"; rev = "v${version}"; - sha256 = "1n08fmaf7q13y68xyzs4h686hvb7n5mdyvn1zy81d7gh0m5013k4"; + sha256 = "0v5iy9wy05hf44wy7qs0c9q0v34m4k6wrqg4kyvji61568k1yx3k"; }; buildInputs = [ emacs texinfo ]; diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix new file mode 100644 index 000000000000..3cc8156337e0 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, emacs }: + +let + version = "3.6-4-gb659bf8"; +in +stdenv.mkDerivation { + name = "ido-ubiquitous-${version}"; + + src = fetchFromGitHub { + owner = "DarwinAwardWinner"; + repo = "ido-ubiquitous"; + rev = version; + sha256 = "06r8qpfr60gc673w881m0nplj91b6bfw77bxgl6irz1z9bp7cc4y"; + }; + + buildInputs = [ emacs ]; + + buildPhase = '' + emacs -L . --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + install -d $out/share/emacs/site-lisp + install *.el *.elc $out/share/emacs/site-lisp + ''; +} diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 676a86985f8f..8d71ca582022 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,33 +1,41 @@ -{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }: +{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }: -stdenv.mkDerivation rec { - name = "magit-90141025"; +let + version = "2.2.1"; +in +stdenv.mkDerivation { + name = "magit-${version}"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "50c08522c8a3c67e0f3b821fe4df61e8bd456ff9"; - sha256 = "0mzyx72pidzvla1x2qszn3c60n2j0n8i5k875c4difvd1n4p0vsk"; + rev = version; + sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz"; }; buildInputs = [ emacs texinfo git ]; - propagatedUserEnvPkgs = [ gitModes ]; + propagatedUserEnvPkgs = [ gitModes dash ]; configurePhase = '' makeFlagsArray=( PREFIX="$out" - EFLAGS="-L ${gitModes}/share/emacs/site-lisp" lispdir="$out/share/emacs/site-lisp" + DASH_DIR="${dash}/share/emacs/site-lisp" + VERSION="${version}" ) + make ''${makeFlagsArray[@]} -C lisp magit-version.el + cp lisp/magit-version.el Documentation/ + cp lisp/magit-version.el . ''; - doCheck = true; + doCheck = false; # one out of 5 tests fails, not sure why checkTarget = "test"; + preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'"; - postInstall = '' - mkdir -p $out/bin - mv "bin/"* $out/bin/ - ''; + # postInstall = '' + # mkdir -p $out/bin + # mv "bin/"* $out/bin/ + # ''; meta = { homepage = "https://github.com/magit/magit"; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e394ae4d6a38..e2889abb913d 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -273,25 +273,25 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "4.5.3"; - build = "141.1899"; + version = "4.5.4"; + build = "141.2569"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "13f3mp7gcl27fikxjlwk7n1gyxa46q0wfgniang4knb596wlfli0"; + url = "https://download-cf.jetbrains.com/python/${name}.tar.gz"; + sha256 = "0a2208rjcvcm9dww317clwiil3ddza3qq9wqkvr0rrcfp1739pbb"; }; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "4.5.3"; - build = "141.1899"; + version = "4.5.4"; + build = "141.2569"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { - url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "00b66fy841vjm54n2fby5wf7y8ihihqgydr6329iv9p5s0mgzh2s"; + url = "https://download-cf.jetbrains.com/python/${name}.tar.gz"; + sha256 = "1dy64myih92kxmi6h9y142dbmmwwphs2n3vswyg53881g5i0lfhd"; }; }; diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix new file mode 100644 index 000000000000..4e8324894abf --- /dev/null +++ b/pkgs/applications/editors/ne/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }: + + +stdenv.mkDerivation rec { + name = "ne-${version}"; + version = "3.0.1"; + src = fetchFromGitHub { + owner = "vigna"; + repo = "ne"; + rev = version; + sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp"; + }; + buildInputs = [ ncurses tetex texinfo perl ghostscript ]; + dontBuild = true; + installPhase = '' + substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" + substituteInPlace src/makefile --replace "-lcurses" "-lncurses" + substituteInPlace makefile --replace "./version.pl" "perl version.pl" + cd doc && make && cd .. + cd src && make && cd .. + make PREFIX=$out install + ''; + + meta = { + description = "the nice editor"; + homepage = https://github.com/vigna/ne; + longDescription = '' + ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any +UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, +and most sparing in its resource usage. See the manual for some highlights of ne's features. + ''; + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 683e2721d876..c25cc11c203c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -4,22 +4,19 @@ }: let - - version = "6.9.1-0"; - arch = if stdenv.system == "i686-linux" then "i686" else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" else throw "ImageMagick is not supported on this platform."; - in stdenv.mkDerivation rec { name = "imagemagick-${version}"; + version = "6.9.2-0"; src = fetchurl { url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"; - sha256 = "03lvj6rxv16xk0dpsbzvm2gq5bggkwff9wqbpkq0znihzijpax1j"; + sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; }; outputs = [ "out" "doc" ]; @@ -43,7 +40,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ]; - postInstall = ''(cd "$out/include" && ln -s ImageMagick* ImageMagick)''; + postInstall = '' + (cd "$out/include" && ln -s ImageMagick* ImageMagick) + '' + lib.optionalString (ghostscript != null) '' + for la in $out/lib/*.la; do + sed 's|-lgs|-L${ghostscript}/lib -lgs|' -i $la + done + ''; meta = with stdenv.lib; { homepage = http://www.imagemagick.org/; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index cfc15ed87bf2..b07b889ca13e 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "digikam-4.11.0"; + name = "digikam-4.12.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "1nak3w0717fpbpmklzd3xkkbp2mwi44yxnc789wzmi9d8z9n3jwh"; + sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 94102663a8c9..49bfb47c85a4 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = stdenv.isLinux && stdenv.isi686; }; } diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 743215493187..66fc4810e7d9 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7"; }; + outputs = [ "out" "doc" "man" ]; + udevSupport = hotplugSupport; configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0"; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 2591c3f7ffb8..8a0286700c96 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb, libxml2 -, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: +{ stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb +, libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }: -let version = "3.17.90"; in +let version = "3.17.91"; in stdenv.mkDerivation rec { name = "simple-scan-${version}"; src = fetchurl { - sha256 = "0xc3ln97dgvxrwy2qn82k9qvsr5kxksms4igzkivya3xpq2kx85c"; + sha256 = "051mwm1kzyfp3mg5z5nkjp7v82swdfvz1v8biap19klg193qjmxc"; url = "https://launchpad.net/simple-scan/3.17/${version}/+download/${name}.tar.xz"; }; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { + inherit version; description = "Simple scanning utility"; longDescription = '' A really easy way to scan both documents and photos. You can crop out the diff --git a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch new file mode 100644 index 000000000000..b2679b95a864 --- /dev/null +++ b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch @@ -0,0 +1,28 @@ +From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 30 Aug 2015 07:05:03 -0500 +Subject: [PATCH] qalculate filename string type + +--- + src/backends/qalculate/qalculateexpression.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp +index 1891baa..b2a1984 100644 +--- a/src/backends/qalculate/qalculateexpression.cpp ++++ b/src/backends/qalculate/qalculateexpression.cpp +@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand() + if (plotParameters.filetype == PLOT_FILETYPE_EPS || + plotParameters.filetype == PLOT_FILETYPE_PS || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 && +- plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) || ++ plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) || + (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 && +- plotParameters.filename.substr(p-3,3) == QLatin1String(".ps"))) ++ plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps"))) + setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str()))); + else + setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str()))); +-- +2.5.0 + diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix index 5c36b735338e..83aca36bc003 100644 --- a/pkgs/applications/kde-apps-15.04/default.nix +++ b/pkgs/applications/kde-apps-15.04/default.nix @@ -223,6 +223,10 @@ let ''; }; + cantor = extendDerivation (kde4Package super.cantor) { + patches = [ ./cantor/0001-qalculate-filename-string-type.patch ]; + }; + cervisia = kde4Package super.cervisia; dolphin-plugins = kde4Package super.dolphin-plugins; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 7f8a42b077e9..d5c039e3b896 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "calibre-${version}"; - version = "2.35.0"; + version = "2.37.1"; src = fetchurl { url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz"; - sha256 = "13sic0l16myvka8mgpr56h6qlpf1cwx8xlf4acp3qz6gsmz3r23x"; + sha256 = "0cbpkhchxjz9dz4chkrlgq0q1sjmyp6lm9vrhnm2mwai61kzn25s"; }; inherit python; diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix new file mode 100644 index 000000000000..4d13e62bdfec --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, dpkg, bash, python27Packages }: + +let + py = python27Packages; +in +stdenv.mkDerivation rec { + name = "cura-lulzbot"; + version = "15.02.1-1.03-5064"; + + src = + if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-amd64/cura_${version}_amd64.deb"; + sha256 = "1gsfidg3gim5pjbl82vkh0cw4ya253m4p7nirm8nr6yjrsirkzxg"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "http://download.alephobjects.com/ao/aodeb/dists/jessie/main/binary-i386/cura_${version}_i386.deb"; + sha256 = "0xd3df6bxq4rijgvsqvps454jkc1nzhxbdzzj6j2w317ppsbhyc1"; + } + else throw "${name} is not supported on ${stdenv.system}"; + + python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ]; + pythonPath = python_deps; + propagatedBuildInputs = python_deps; + buildInputs = [ dpkg bash py.wrapPython ]; + + phases = [ "unpackPhase" "installPhase" ]; + unpackPhase = "dpkg-deb -x ${src} ./"; + + installPhase = '' + mkdir -p $out/bin + cp -r usr/share $out/share + find $out/share -type f -exec sed -i 's|/usr/share/cura|$out/share/cura|g' "{}" \; + + cat <<EOT > $out/bin/cura + #!${bash}/bin/bash + PYTHONPATH=$PYTHONPATH:$out/share/cura ${py.python}/bin/python $out/share/cura/cura.py "\$@" + EOT + + chmod 555 $out/bin/cura + ''; + + meta = with stdenv.lib; { + description = "3D printing host software for the Lulzbot"; + + longDescription = '' + Cura LulzBot Edition is a fork of the 3D printing/slicing + software from Ultimaker, with changes to support 3D printers + from Aleph Objects. + ''; + + homepage = https://www.lulzbot.com/cura/; + license = licenses.agpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ pjones ]; + }; +} diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index b1fdc50fe15c..ed37b0d96bc7 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { name = "electrum-${version}"; - version = "2.4"; + version = "2.4.3"; src = fetchurl { url = "https://download.electrum.org/Electrum-${version}.tar.gz"; - sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx"; + sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f"; }; propagatedBuildInputs = with pythonPackages; [ @@ -27,6 +27,7 @@ buildPythonPackage rec { preInstall = '' mkdir -p $out/share sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py + pyrcc4 icons.qrc -o gui/qt/icons_rc.py ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 9c592fcbb2d0..ce57db371dde 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -5,8 +5,8 @@ let mupdf_src = fetchurl { - url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz; - sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; + url = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz; + sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq"; }; tess_src = fetchurl { @@ -21,10 +21,10 @@ let in stdenv.mkDerivation rec { name = "k2pdfopt-${version}"; - version = "2.30"; + version = "2.32"; src = fetchzip { url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; - sha256 = "1fjjznkplrbyrg48wbij4kqgkz9i5icq7savl6brsf9haahdz6q5"; + sha256 = "1v3cj5bwpjvy7s66sfqcmkxs91f7nxaykjpdjm2wn87vn6q7n19m"; }; buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib @@ -41,8 +41,8 @@ in stdenv.mkDerivation rec { plibs=`pwd`/patched_libraries tar zxf ${mupdf_src} - cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/ - cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf + cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.6-source/source/fitz/ + cp $src/mupdf_mod/pdf-* mupdf-1.6-source/source/pdf tar zxf ${tess_src} cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { make libs cp src/libPgm2asc.a $plibs/lib - cd ../mupdf-1.5-source + cd ../mupdf-1.6-source make prefix=$plibs install install -Dm644 build/debug/libmujs.a $plibs/lib diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index ff61ea5d0103..6a5ce9fd6043 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, libgcrypt, qt4, xlibs, ... }: stdenv.mkDerivation { - name = "keepassx2-2.0beta1"; + name = "keepassx2-2.0beta2"; src = fetchurl { - url = "https://github.com/keepassx/keepassx/archive/2.0-beta1.tar.gz"; - sha256 = "1wnbk9laixz16lmchr1lnv8m9i6rkxv6slnx8f0fyczx90y97qdw"; + url = "https://github.com/keepassx/keepassx/archive/2.0-beta2.tar.gz"; + sha256 = "0ljf9ws3wh62zd0gyb0vk2qw6pqsmxrlybrfs5mqahf44q92ca2q"; }; buildInputs = [ cmake libgcrypt qt4 xlibs.libXtst ]; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 939edc97be1a..55de14257878 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.76"; + version = "0.7.77"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck"; + sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 4a5fffe533d6..5c6f3f9a148a 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.76"; + version = "0.7.77"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "14vy2a9bjjwxyk8zh0ysin8fb1lj9yz17yd82vxrp1zvxsgyg5ck"; + sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 828019011fc4..e768a692f594 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "0.8.4"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0"; + sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz"; }; buildInputs = [ git gnupg makeWrapper pass qt5.base ]; diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index a57647e18e70..a5b90890df2a 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,17 +5,18 @@ let if stdenv.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq"; + sha256 = "15x3nvhxk4f0rga0i99c6lhaa1rwdi446kxnx1l4jprhbl788sx6"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5"; + sha256 = "0ibdlx8fdlmh81908d1syb7c5lf88pqp49fl7r43cj6bybpdx411"; }; in stdenv.mkDerivation { - name = "rescuetime-2.8.8.1040"; + # https://www.rescuetime.com/updates/linux_release_notes.html + name = "rescuetime-2.8.9.1170"; inherit src; buildInputs = [ dpkg makeWrapper ]; unpackPhase = '' diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index 20f2bcc17002..7a8c9dfd71ef 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.0"; + version = "1.2"; src = fetchgit { url = "https://github.com/carnager/rofi-pass"; rev = "refs/tags/${version}"; - sha256 = "16k7bj5mf5alfks8mylp549q3lmpbxjsrsgyj7gibdmhjz768jz3"; + sha256 = "1dlaplr18qady5g8sp8xgiqdw81mfx9iisihf8appr5s4sjm559h"; }; buildInputs = [ rofi wmctrl xprop xdotool ]; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index ea7663c24069..01f55498f806 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,4 +1,4 @@ -{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks }: +{ pkgs, fetchurl, stdenv, gtk3, udev, desktop_file_utils, shared_mime_info , intltool, pkgconfig, makeWrapper, ffmpegthumbnailer, jmtpfs, ifuse, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }: stdenv.mkDerivation rec { name = "spacefm-${version}"; diff --git a/pkgs/applications/misc/tessel/default.nix b/pkgs/applications/misc/tessel/default.nix deleted file mode 100644 index 6a11713c7501..000000000000 --- a/pkgs/applications/misc/tessel/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, callPackage, libusb1, pkgconfig, python, utillinux }: - -with stdenv.lib; - -let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - neededNatives = [ libusb1 pkgconfig python utillinux ]; - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - name = "tessel-0.3.16"; - bin = true; - - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tessel/-/tessel-0.3.16.tgz"; - name = "tessel-0.3.16.tgz"; - sha1 = "900a8d897ba03d7a9d5927697180284772d70738"; - }) - ]; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - postInstall = '' - mkdir -p $out/etc/udev/rules.d - cp $out/lib/node_modules/tessel/install/85-tessel.rules $out/etc/udev/rules.d/ - ''; - - passthru.names = [ "tessel" ]; - - meta = { - description = "Command line tools and programmatic access library for Tessel devices"; - homepage = https://tessel.io; - license = licenses.mit; - maintainers = with maintainers; [ goibhniu ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/tessel/package.nix b/pkgs/applications/misc/tessel/package.nix deleted file mode 100644 index d388387ccaf8..000000000000 --- a/pkgs/applications/misc/tessel/package.nix +++ /dev/null @@ -1,1974 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."abbrev"."1" = - self.by-version."abbrev"."1.0.5"; - by-version."abbrev"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "abbrev-1.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; - name = "abbrev-1.0.5.tgz"; - sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; - }) - ]; - buildInputs = - (self.nativeDeps."abbrev" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "abbrev" ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage { - name = "asn1-0.1.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }) - ]; - buildInputs = - (self.nativeDeps."asn1" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "asn1" ]; - }; - by-spec."assert-plus"."0.1.2" = - self.by-version."assert-plus"."0.1.2"; - by-version."assert-plus"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "assert-plus-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"; - name = "assert-plus-0.1.2.tgz"; - sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8"; - }) - ]; - buildInputs = - (self.nativeDeps."assert-plus" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "assert-plus" ]; - }; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = lib.makeOverridable self.buildNodePackage { - name = "async-0.2.10"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - "async" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.0"; - by-version."async"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.9.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz"; - name = "async-0.9.0.tgz"; - sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "aws-sign2-0.5.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sign2" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "aws-sign2" ]; - }; - by-spec."bindings-shyp"."~0.2.3" = - self.by-version."bindings-shyp"."0.2.3"; - by-version."bindings-shyp"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "bindings-shyp-0.2.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bindings-shyp/-/bindings-shyp-0.2.3.tgz"; - name = "bindings-shyp-0.2.3.tgz"; - sha1 = "909151c14c701f350eb6be8ad14784ad79813671"; - }) - ]; - buildInputs = - (self.nativeDeps."bindings-shyp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "bindings-shyp" ]; - }; - by-spec."block-stream"."*" = - self.by-version."block-stream"."0.0.7"; - by-version."block-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "block-stream-0.0.7"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; - name = "block-stream-0.0.7.tgz"; - sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; - }) - ]; - buildInputs = - (self.nativeDeps."block-stream" or []); - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "block-stream" ]; - }; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "boom-0.4.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }) - ]; - buildInputs = - (self.nativeDeps."boom" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "boom" ]; - }; - by-spec."buffer-equal"."~0.0.0" = - self.by-version."buffer-equal"."0.0.1"; - by-version."buffer-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-equal-0.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"; - name = "buffer-equal-0.0.1.tgz"; - sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "buffer-equal" ]; - }; - by-spec."bunker"."0.1.X" = - self.by-version."bunker"."0.1.2"; - by-version."bunker"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "bunker-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz"; - name = "bunker-0.1.2.tgz"; - sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c"; - }) - ]; - buildInputs = - (self.nativeDeps."bunker" or []); - deps = { - "burrito-0.2.12" = self.by-version."burrito"."0.2.12"; - }; - peerDependencies = [ - ]; - passthru.names = [ "bunker" ]; - }; - by-spec."burrito".">=0.2.5 <0.3" = - self.by-version."burrito"."0.2.12"; - by-version."burrito"."0.2.12" = lib.makeOverridable self.buildNodePackage { - name = "burrito-0.2.12"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz"; - name = "burrito-0.2.12.tgz"; - sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"; - }) - ]; - buildInputs = - (self.nativeDeps."burrito" or []); - deps = { - "traverse-0.5.2" = self.by-version."traverse"."0.5.2"; - "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "burrito" ]; - }; - by-spec."charm"."0.1.x" = - self.by-version."charm"."0.1.2"; - by-version."charm"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "charm-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz"; - name = "charm-0.1.2.tgz"; - sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296"; - }) - ]; - buildInputs = - (self.nativeDeps."charm" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "charm" ]; - }; - by-spec."colony-compiler"."~0.6.21" = - self.by-version."colony-compiler"."0.6.23"; - by-version."colony-compiler"."0.6.23" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-0.6.23"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler/-/colony-compiler-0.6.23.tgz"; - name = "colony-compiler-0.6.23.tgz"; - sha1 = "0bef9e899e1ae928f6fe5e0dcca6cab4d47ab448"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler" or []); - deps = { - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "optimist-0.5.2" = self.by-version."optimist"."0.5.2"; - "nan-1.0.0" = self.by-version."nan"."1.0.0"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; - # "colony-compiler-shyp-win32-ia32-0.6.17-1" = self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; - # "colony-compiler-shyp-win32-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; - # "colony-compiler-shyp-darwin-x64-0.6.17-0" = self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler" ]; - }; - "colony-compiler" = self.by-version."colony-compiler"."0.6.23"; - by-spec."colony-compiler-shyp-darwin-x64"."0.6.x" = - self.by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0"; - by-version."colony-compiler-shyp-darwin-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-darwin-x64-0.6.17-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-darwin-x64/-/colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; - name = "colony-compiler-shyp-darwin-x64-0.6.17-0.tgz"; - sha1 = "33eedbee7ff8679fde69ba03bf27777110113732"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-darwin-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-darwin-x64" ]; - }; - by-spec."colony-compiler-shyp-win32-ia32"."0.6.x" = - self.by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1"; - by-version."colony-compiler-shyp-win32-ia32"."0.6.17-1" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-win32-ia32-0.6.17-1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-win32-ia32/-/colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; - name = "colony-compiler-shyp-win32-ia32-0.6.17-1.tgz"; - sha1 = "6e11a978be5df7be00112d2a349d5e34925f443a"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-win32-ia32" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-win32-ia32" ]; - }; - by-spec."colony-compiler-shyp-win32-x64"."0.6.x" = - self.by-version."colony-compiler-shyp-win32-x64"."0.6.17-0"; - by-version."colony-compiler-shyp-win32-x64"."0.6.17-0" = lib.makeOverridable self.buildNodePackage { - name = "colony-compiler-shyp-win32-x64-0.6.17-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colony-compiler-shyp-win32-x64/-/colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; - name = "colony-compiler-shyp-win32-x64-0.6.17-0.tgz"; - sha1 = "cd30416df0ab52e49c74e81d69bd23329983d005"; - }) - ]; - buildInputs = - (self.nativeDeps."colony-compiler-shyp-win32-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colony-compiler-shyp-win32-x64" ]; - }; - by-spec."colors"."0.5.x" = - self.by-version."colors"."0.5.1"; - by-version."colors"."0.5.1" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.5.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz"; - name = "colors-0.5.1.tgz"; - sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - by-spec."colors"."~0.6.0-1" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "colors-0.6.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }) - ]; - buildInputs = - (self.nativeDeps."colors" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colors" ]; - }; - "colors" = self.by-version."colors"."0.6.2"; - by-spec."colors"."~0.6.1" = - self.by-version."colors"."0.6.2"; - by-spec."colorsafeconsole"."0.0.4" = - self.by-version."colorsafeconsole"."0.0.4"; - by-version."colorsafeconsole"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "colorsafeconsole-0.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/colorsafeconsole/-/colorsafeconsole-0.0.4.tgz"; - name = "colorsafeconsole-0.0.4.tgz"; - sha1 = "dc10508bb000e51964fb485fd8557faa169effbe"; - }) - ]; - buildInputs = - (self.nativeDeps."colorsafeconsole" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "colorsafeconsole" ]; - }; - "colorsafeconsole" = self.by-version."colorsafeconsole"."0.0.4"; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage { - name = "combined-stream-0.0.7"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }) - ]; - buildInputs = - (self.nativeDeps."combined-stream" or []); - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "combined-stream" ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "cryptiles-0.2.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }) - ]; - buildInputs = - (self.nativeDeps."cryptiles" or []); - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "cryptiles" ]; - }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "ctype-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }) - ]; - buildInputs = - (self.nativeDeps."ctype" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ctype" ]; - }; - by-spec."debug"."^0.8.1" = - self.by-version."debug"."0.8.1"; - by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "debug-0.8.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz"; - name = "debug-0.8.1.tgz"; - sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130"; - }) - ]; - buildInputs = - (self.nativeDeps."debug" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "debug" ]; - }; - "debug" = self.by-version."debug"."0.8.1"; - by-spec."deep-equal"."~0.0.0" = - self.by-version."deep-equal"."0.0.0"; - by-version."deep-equal"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz"; - name = "deep-equal-0.0.0.tgz"; - sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; - }; - by-spec."deep-equal"."~0.2.0" = - self.by-version."deep-equal"."0.2.1"; - by-version."deep-equal"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "deep-equal-0.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz"; - name = "deep-equal-0.2.1.tgz"; - sha1 = "fad7a793224cbf0c3c7786f92ef780e4fc8cc878"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-equal" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-equal" ]; - }; - by-spec."deep-is"."0.1.x" = - self.by-version."deep-is"."0.1.3"; - by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "deep-is-0.1.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - name = "deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }) - ]; - buildInputs = - (self.nativeDeps."deep-is" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "deep-is" ]; - }; - by-spec."defined"."~0.0.0" = - self.by-version."defined"."0.0.0"; - by-version."defined"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "defined-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz"; - name = "defined-0.0.0.tgz"; - sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e"; - }) - ]; - buildInputs = - (self.nativeDeps."defined" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "defined" ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "delayed-stream-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }) - ]; - buildInputs = - (self.nativeDeps."delayed-stream" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "delayed-stream" ]; - }; - by-spec."difflet"."~0.2.0" = - self.by-version."difflet"."0.2.6"; - by-version."difflet"."0.2.6" = lib.makeOverridable self.buildNodePackage { - name = "difflet-0.2.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz"; - name = "difflet-0.2.6.tgz"; - sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa"; - }) - ]; - buildInputs = - (self.nativeDeps."difflet" or []); - deps = { - "traverse-0.6.6" = self.by-version."traverse"."0.6.6"; - "charm-0.1.2" = self.by-version."charm"."0.1.2"; - "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "difflet" ]; - }; - by-spec."effess"."~0.0.2" = - self.by-version."effess"."0.0.5"; - by-version."effess"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "effess-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/effess/-/effess-0.0.5.tgz"; - name = "effess-0.0.5.tgz"; - sha1 = "d328fd03929c168c02a63d9d3d889657dc9499db"; - }) - ]; - buildInputs = - (self.nativeDeps."effess" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "effess" ]; - }; - by-spec."effess"."~0.0.5" = - self.by-version."effess"."0.0.5"; - "effess" = self.by-version."effess"."0.0.5"; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "forever-agent-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }) - ]; - buildInputs = - (self.nativeDeps."forever-agent" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "forever-agent" ]; - }; - by-spec."form-data"."~0.1.0" = - self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "form-data-0.1.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }) - ]; - buildInputs = - (self.nativeDeps."form-data" or []); - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.0" = self.by-version."async"."0.9.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "form-data" ]; - }; - by-spec."fstream"."~0.1.25" = - self.by-version."fstream"."0.1.31"; - by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage { - name = "fstream-0.1.31"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; - name = "fstream-0.1.31.tgz"; - sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; - }) - ]; - buildInputs = - (self.nativeDeps."fstream" or []); - deps = { - "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - }; - peerDependencies = [ - ]; - passthru.names = [ "fstream" ]; - }; - "fstream" = self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.28" = - self.by-version."fstream"."0.1.31"; - by-spec."glob"."~3.2.1" = - self.by-version."glob"."3.2.11"; - by-version."glob"."3.2.11" = lib.makeOverridable self.buildNodePackage { - name = "glob-3.2.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz"; - name = "glob-3.2.11.tgz"; - sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; - }) - ]; - buildInputs = - (self.nativeDeps."glob" or []); - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "glob" ]; - }; - by-spec."glob"."~3.2.9" = - self.by-version."glob"."3.2.11"; - by-spec."graceful-fs"."~1" = - self.by-version."graceful-fs"."1.2.3"; - by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-1.2.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; - name = "graceful-fs-1.2.3.tgz"; - sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.4"; - by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-3.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"; - name = "graceful-fs-3.0.4.tgz"; - sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3"; - }) - ]; - buildInputs = - (self.nativeDeps."graceful-fs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "graceful-fs" ]; - }; - by-spec."hardware-resolve"."~0.1.3" = - self.by-version."hardware-resolve"."0.1.6"; - by-version."hardware-resolve"."0.1.6" = lib.makeOverridable self.buildNodePackage { - name = "hardware-resolve-0.1.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hardware-resolve/-/hardware-resolve-0.1.6.tgz"; - name = "hardware-resolve-0.1.6.tgz"; - sha1 = "b03f5077ab1b4b185ecd9486a3ba754f4b46e02a"; - }) - ]; - buildInputs = - (self.nativeDeps."hardware-resolve" or []); - deps = { - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - "effess-0.0.5" = self.by-version."effess"."0.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "hardware-resolve" ]; - }; - "hardware-resolve" = self.by-version."hardware-resolve"."0.1.6"; - by-spec."hawk"."~1.0.0" = - self.by-version."hawk"."1.0.0"; - by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "hawk-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; - name = "hawk-1.0.0.tgz"; - sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; - }) - ]; - buildInputs = - (self.nativeDeps."hawk" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "hawk" ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "hoek-0.9.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }) - ]; - buildInputs = - (self.nativeDeps."hoek" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "hoek" ]; - }; - by-spec."http-signature"."~0.10.0" = - self.by-version."http-signature"."0.10.0"; - by-version."http-signature"."0.10.0" = lib.makeOverridable self.buildNodePackage { - name = "http-signature-0.10.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz"; - name = "http-signature-0.10.0.tgz"; - sha1 = "1494e4f5000a83c0f11bcc12d6007c530cb99582"; - }) - ]; - buildInputs = - (self.nativeDeps."http-signature" or []); - deps = { - "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.2" = self.by-version."ctype"."0.5.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "http-signature" ]; - }; - by-spec."humanize"."0.0.9" = - self.by-version."humanize"."0.0.9"; - by-version."humanize"."0.0.9" = lib.makeOverridable self.buildNodePackage { - name = "humanize-0.0.9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz"; - name = "humanize-0.0.9.tgz"; - sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4"; - }) - ]; - buildInputs = - (self.nativeDeps."humanize" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "humanize" ]; - }; - "humanize" = self.by-version."humanize"."0.0.9"; - by-spec."inherits"."*" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "inherits-2.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }) - ]; - buildInputs = - (self.nativeDeps."inherits" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "inherits" ]; - }; - by-spec."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.0" = - self.by-version."inherits"."2.0.1"; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.0"; - by-version."json-stringify-safe"."5.0.0" = lib.makeOverridable self.buildNodePackage { - name = "json-stringify-safe-5.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"; - name = "json-stringify-safe-5.0.0.tgz"; - sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e"; - }) - ]; - buildInputs = - (self.nativeDeps."json-stringify-safe" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "json-stringify-safe" ]; - }; - by-spec."keypress"."~0.2.1" = - self.by-version."keypress"."0.2.1"; - by-version."keypress"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "keypress-0.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz"; - name = "keypress-0.2.1.tgz"; - sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; - }) - ]; - buildInputs = - (self.nativeDeps."keypress" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "keypress" ]; - }; - "keypress" = self.by-version."keypress"."0.2.1"; - by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "lru-cache-2.5.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; - }) - ]; - buildInputs = - (self.nativeDeps."lru-cache" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "lru-cache" ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage { - name = "mime-1.2.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }) - ]; - buildInputs = - (self.nativeDeps."mime" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mime" ]; - }; - by-spec."mime"."~1.2.9" = - self.by-version."mime"."1.2.11"; - by-spec."minimatch"."0.3" = - self.by-version."minimatch"."0.3.0"; - by-version."minimatch"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"; - name = "minimatch-0.3.0.tgz"; - sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; - by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { - name = "minimatch-0.2.14"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - name = "minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }) - ]; - buildInputs = - (self.nativeDeps."minimatch" or []); - deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "minimatch" ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.0.8"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; - by-spec."mkdirp"."0.5" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.5.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - by-spec."mkdirp"."~0.3 || 0.4 || 0.5" = - self.by-version."mkdirp"."0.5.0"; - by-spec."mkdirp"."~0.3.5" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "mkdirp-0.3.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }) - ]; - buildInputs = - (self.nativeDeps."mkdirp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mkdirp" ]; - }; - "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."mute-stream"."~0.0.4" = - self.by-version."mute-stream"."0.0.4"; - by-version."mute-stream"."0.0.4" = lib.makeOverridable self.buildNodePackage { - name = "mute-stream-0.0.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"; - name = "mute-stream-0.0.4.tgz"; - sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e"; - }) - ]; - buildInputs = - (self.nativeDeps."mute-stream" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "mute-stream" ]; - }; - by-spec."my-local-ip"."~1.0.0" = - self.by-version."my-local-ip"."1.0.0"; - by-version."my-local-ip"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "my-local-ip-1.0.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/my-local-ip/-/my-local-ip-1.0.0.tgz"; - name = "my-local-ip-1.0.0.tgz"; - sha1 = "37585555a4ff1985309edac7c2a045a466be6c32"; - }) - ]; - buildInputs = - (self.nativeDeps."my-local-ip" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "my-local-ip" ]; - }; - "my-local-ip" = self.by-version."my-local-ip"."1.0.0"; - by-spec."nan"."~1.0.0" = - self.by-version."nan"."1.0.0"; - by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "nan-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; - name = "nan-1.0.0.tgz"; - sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; - }) - ]; - buildInputs = - (self.nativeDeps."nan" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "nan" ]; - }; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }) - ]; - buildInputs = - (self.nativeDeps."node-uuid" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "node-uuid" ]; - }; - by-spec."nomnom"."~1.6.2" = - self.by-version."nomnom"."1.6.2"; - by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { - name = "nomnom-1.6.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz"; - name = "nomnom-1.6.2.tgz"; - sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971"; - }) - ]; - buildInputs = - (self.nativeDeps."nomnom" or []); - deps = { - "colors-0.5.1" = self.by-version."colors"."0.5.1"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "nomnom" ]; - }; - "nomnom" = self.by-version."nomnom"."1.6.2"; - by-spec."nopt"."~2" = - self.by-version."nopt"."2.2.1"; - by-version."nopt"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nopt-2.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; - name = "nopt-2.2.1.tgz"; - sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; - }) - ]; - buildInputs = - (self.nativeDeps."nopt" or []); - deps = { - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - }; - peerDependencies = [ - ]; - passthru.names = [ "nopt" ]; - }; - by-spec."oauth-sign"."~0.3.0" = - self.by-version."oauth-sign"."0.3.0"; - by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "oauth-sign-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; - name = "oauth-sign-0.3.0.tgz"; - sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; - }) - ]; - buildInputs = - (self.nativeDeps."oauth-sign" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "oauth-sign" ]; - }; - by-spec."object-inspect"."~0.4.0" = - self.by-version."object-inspect"."0.4.0"; - by-version."object-inspect"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "object-inspect-0.4.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz"; - name = "object-inspect-0.4.0.tgz"; - sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec"; - }) - ]; - buildInputs = - (self.nativeDeps."object-inspect" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "object-inspect" ]; - }; - by-spec."optimist"."~0.5.2" = - self.by-version."optimist"."0.5.2"; - by-version."optimist"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "optimist-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.5.2.tgz"; - name = "optimist-0.5.2.tgz"; - sha1 = "85c8c1454b3315e4a78947e857b1df033450bfbc"; - }) - ]; - buildInputs = - (self.nativeDeps."optimist" or []); - deps = { - "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "optimist" ]; - }; - by-spec."osenv"."0.0.3" = - self.by-version."osenv"."0.0.3"; - by-version."osenv"."0.0.3" = lib.makeOverridable self.buildNodePackage { - name = "osenv-0.0.3"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; - name = "osenv-0.0.3.tgz"; - sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; - }) - ]; - buildInputs = - (self.nativeDeps."osenv" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "osenv" ]; - }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.2"; - by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "punycode-1.3.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - name = "punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }) - ]; - buildInputs = - (self.nativeDeps."punycode" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "punycode" ]; - }; - by-spec."qs"."~0.6.0" = - self.by-version."qs"."0.6.6"; - by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "qs-0.6.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; - name = "qs-0.6.6.tgz"; - sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; - }) - ]; - buildInputs = - (self.nativeDeps."qs" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "qs" ]; - }; - by-spec."read"."^1.0.5" = - self.by-version."read"."1.0.5"; - by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "read-1.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz"; - name = "read-1.0.5.tgz"; - sha1 = "007a3d169478aa710a491727e453effb92e76203"; - }) - ]; - buildInputs = - (self.nativeDeps."read" or []); - deps = { - "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "read" ]; - }; - "read" = self.by-version."read"."1.0.5"; - by-spec."request"."~2.33.0" = - self.by-version."request"."2.33.0"; - by-version."request"."2.33.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.33.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.33.0.tgz"; - name = "request-2.33.0.tgz"; - sha1 = "5167878131726070ec633752ea230a2379dc65ff"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; - "request" = self.by-version."request"."2.33.0"; - by-spec."resumer"."~0.0.0" = - self.by-version."resumer"."0.0.0"; - by-version."resumer"."0.0.0" = lib.makeOverridable self.buildNodePackage { - name = "resumer-0.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - name = "resumer-0.0.0.tgz"; - sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759"; - }) - ]; - buildInputs = - (self.nativeDeps."resumer" or []); - deps = { - "through-2.3.6" = self.by-version."through"."2.3.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "resumer" ]; - }; - by-spec."rimraf"."2" = - self.by-version."rimraf"."2.2.8"; - by-version."rimraf"."2.2.8" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.2.8"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - name = "rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."rimraf"."~2.1.4" = - self.by-version."rimraf"."2.1.4"; - by-version."rimraf"."2.1.4" = lib.makeOverridable self.buildNodePackage { - name = "rimraf-2.1.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz"; - name = "rimraf-2.1.4.tgz"; - sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2"; - }) - ]; - buildInputs = - (self.nativeDeps."rimraf" or []); - deps = { - "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "rimraf" ]; - }; - by-spec."runforcover"."~0.0.2" = - self.by-version."runforcover"."0.0.2"; - by-version."runforcover"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "runforcover-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz"; - name = "runforcover-0.0.2.tgz"; - sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc"; - }) - ]; - buildInputs = - (self.nativeDeps."runforcover" or []); - deps = { - "bunker-0.1.2" = self.by-version."bunker"."0.1.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "runforcover" ]; - }; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; - by-version."semver"."2.3.2" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.3.2"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz"; - name = "semver-2.3.2.tgz"; - sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52"; - }) - ]; - buildInputs = - (self.nativeDeps."semver" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "semver" ]; - }; - "semver" = self.by-version."semver"."2.3.2"; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.0"; - by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "sigmund-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"; - name = "sigmund-1.0.0.tgz"; - sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296"; - }) - ]; - buildInputs = - (self.nativeDeps."sigmund" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "sigmund" ]; - }; - by-spec."slide"."*" = - self.by-version."slide"."1.1.6"; - by-version."slide"."1.1.6" = lib.makeOverridable self.buildNodePackage { - name = "slide-1.1.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz"; - name = "slide-1.1.6.tgz"; - sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; - }) - ]; - buildInputs = - (self.nativeDeps."slide" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "slide" ]; - }; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sntp-0.2.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }) - ]; - buildInputs = - (self.nativeDeps."sntp" or []); - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "sntp" ]; - }; - by-spec."structured-clone"."~0.2.2" = - self.by-version."structured-clone"."0.2.2"; - by-version."structured-clone"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "structured-clone-0.2.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/structured-clone/-/structured-clone-0.2.2.tgz"; - name = "structured-clone-0.2.2.tgz"; - sha1 = "ac92b6be31958a643db30f1335abc6a1b02dfdc2"; - }) - ]; - buildInputs = - (self.nativeDeps."structured-clone" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "structured-clone" ]; - }; - "structured-clone" = self.by-version."structured-clone"."0.2.2"; - by-spec."tap"."~0.4.8" = - self.by-version."tap"."0.4.13"; - by-version."tap"."0.4.13" = lib.makeOverridable self.buildNodePackage { - name = "tap-0.4.13"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tap/-/tap-0.4.13.tgz"; - name = "tap-0.4.13.tgz"; - sha1 = "3986134d6759727fc2223e61126eeb87243accbc"; - }) - ]; - buildInputs = - (self.nativeDeps."tap" or []); - deps = { - "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0"; - "difflet-0.2.6" = self.by-version."difflet"."0.2.6"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tap" ]; - }; - "tap" = self.by-version."tap"."0.4.13"; - by-spec."tape"."~2.12.3" = - self.by-version."tape"."2.12.3"; - by-version."tape"."2.12.3" = lib.makeOverridable self.buildNodePackage { - name = "tape-2.12.3"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tape/-/tape-2.12.3.tgz"; - name = "tape-2.12.3.tgz"; - sha1 = "5559d5454050292627537c012991ec6971f66156"; - }) - ]; - buildInputs = - (self.nativeDeps."tape" or []); - deps = { - "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; - "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0"; - "resumer-0.0.0" = self.by-version."resumer"."0.0.0"; - "through-2.3.6" = self.by-version."through"."2.3.6"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tape" ]; - }; - "tape" = self.by-version."tape"."2.12.3"; - by-spec."tar"."~0.1.18" = - self.by-version."tar"."0.1.20"; - by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage { - name = "tar-0.1.20"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; - name = "tar-0.1.20.tgz"; - sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; - }) - ]; - buildInputs = - (self.nativeDeps."tar" or []); - deps = { - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tar" ]; - }; - "tar" = self.by-version."tar"."0.1.20"; - by-spec."temp"."~0.6.0" = - self.by-version."temp"."0.6.0"; - by-version."temp"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "temp-0.6.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz"; - name = "temp-0.6.0.tgz"; - sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07"; - }) - ]; - buildInputs = - (self.nativeDeps."temp" or []); - deps = { - "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4"; - "osenv-0.0.3" = self.by-version."osenv"."0.0.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "temp" ]; - }; - "temp" = self.by-version."temp"."0.6.0"; - by-spec."through"."~2.3.4" = - self.by-version."through"."2.3.6"; - by-version."through"."2.3.6" = lib.makeOverridable self.buildNodePackage { - name = "through-2.3.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz"; - name = "through-2.3.6.tgz"; - sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8"; - }) - ]; - buildInputs = - (self.nativeDeps."through" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "through" ]; - }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.12.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; - }; - by-spec."traverse"."0.6.x" = - self.by-version."traverse"."0.6.6"; - by-version."traverse"."0.6.6" = lib.makeOverridable self.buildNodePackage { - name = "traverse-0.6.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - name = "traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; - by-spec."traverse"."~0.5.1" = - self.by-version."traverse"."0.5.2"; - by-version."traverse"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "traverse-0.5.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz"; - name = "traverse-0.5.2.tgz"; - sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85"; - }) - ]; - buildInputs = - (self.nativeDeps."traverse" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "traverse" ]; - }; - by-spec."tunnel-agent"."~0.3.0" = - self.by-version."tunnel-agent"."0.3.0"; - by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "tunnel-agent-0.3.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz"; - name = "tunnel-agent-0.3.0.tgz"; - sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee"; - }) - ]; - buildInputs = - (self.nativeDeps."tunnel-agent" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "tunnel-agent" ]; - }; - by-spec."uglify-js"."~1.1.1" = - self.by-version."uglify-js"."1.1.1"; - by-version."uglify-js"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-1.1.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz"; - name = "uglify-js-1.1.1.tgz"; - sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b"; - }) - ]; - buildInputs = - (self.nativeDeps."uglify-js" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "uglify-js" ]; - }; - by-spec."underscore"."~1.4.4" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { - name = "underscore-1.4.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }) - ]; - buildInputs = - (self.nativeDeps."underscore" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "underscore" ]; - }; - by-spec."usb"."~0.3.11" = - self.by-version."usb"."0.3.11"; - by-version."usb"."0.3.11" = lib.makeOverridable self.buildNodePackage { - name = "usb-0.3.11"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb/-/usb-0.3.11.tgz"; - name = "usb-0.3.11.tgz"; - sha1 = "ee61d114181fd1de8738053920cde069d0aa428e"; - }) - ]; - buildInputs = - (self.nativeDeps."usb" or []); - deps = { - "bindings-shyp-0.2.3" = self.by-version."bindings-shyp"."0.2.3"; - # "usb-shyp-win32-x64-0.3.11-0" = self.by-version."usb-shyp-win32-x64"."0.3.11-0"; - # "usb-shyp-win32-ia32-0.3.11-0" = self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; - # "usb-shyp-darwin-x64-0.3.11-0" = self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "usb" ]; - }; - "usb" = self.by-version."usb"."0.3.11"; - by-spec."usb-shyp-darwin-x64"."0.3.x" = - self.by-version."usb-shyp-darwin-x64"."0.3.11-0"; - by-version."usb-shyp-darwin-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-darwin-x64-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-darwin-x64/-/usb-shyp-darwin-x64-0.3.11-0.tgz"; - name = "usb-shyp-darwin-x64-0.3.11-0.tgz"; - sha1 = "8e6c98e5dff676576dac02c8a0465f1eae833285"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-darwin-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-darwin-x64" ]; - }; - by-spec."usb-shyp-win32-ia32"."0.3.x" = - self.by-version."usb-shyp-win32-ia32"."0.3.11-0"; - by-version."usb-shyp-win32-ia32"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-win32-ia32-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-win32-ia32/-/usb-shyp-win32-ia32-0.3.11-0.tgz"; - name = "usb-shyp-win32-ia32-0.3.11-0.tgz"; - sha1 = "365babb7f648cb8aff12f70c65445e1b0958bbbb"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-win32-ia32" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-win32-ia32" ]; - }; - by-spec."usb-shyp-win32-x64"."0.3.x" = - self.by-version."usb-shyp-win32-x64"."0.3.11-0"; - by-version."usb-shyp-win32-x64"."0.3.11-0" = lib.makeOverridable self.buildNodePackage { - name = "usb-shyp-win32-x64-0.3.11-0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/usb-shyp-win32-x64/-/usb-shyp-win32-x64-0.3.11-0.tgz"; - name = "usb-shyp-win32-x64-0.3.11-0.tgz"; - sha1 = "561417f00ab33c9d990a56e3a4ee446a21a3fcbe"; - }) - ]; - buildInputs = - (self.nativeDeps."usb-shyp-win32-x64" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "usb-shyp-win32-x64" ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.2"; - by-version."wordwrap"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "wordwrap-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - name = "wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }) - ]; - buildInputs = - (self.nativeDeps."wordwrap" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "wordwrap" ]; - }; - by-spec."yamlish"."*" = - self.by-version."yamlish"."0.0.6"; - by-version."yamlish"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "yamlish-0.0.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz"; - name = "yamlish-0.0.6.tgz"; - sha1 = "c5df8f7661731351e39eb52223f83a46659452e3"; - }) - ]; - buildInputs = - (self.nativeDeps."yamlish" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "yamlish" ]; - }; -} diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 9afabe0372d1..19fd910195fa 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,33 +1,37 @@ -{ fetchurl, stdenv, pkgconfig, intltool, gettext, gtk, expat, curl +{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412 }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel }: -let version = "1.3"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "viking-${version}"; + version = "1.6"; src = fetchurl { - url = "mirror://sourceforge/viking/viking/${version}/viking-${version}.tar.gz"; - sha256 = "1psgy1myx9xn7zgpvqrpricsv041sz41mm82hj5i28k72fq47p2l"; + url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2"; + sha256 = "02ljnnc1in3cnafmld93qvzgx3j4qsgac2a53q18s6sp5hvvvw91"; }; - buildInputs = - [ pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 - ]; + buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite + ]; - configureFlags = [ "--disable-scrollkeeper" ]; + configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; - preBuild = - '' sed -i help/Makefile \ - -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' - ''; + preBuild = '' + sed -i help/Makefile \ + -e 's|--noout|--noout --nonet --path "${scrollkeeper}/share/xml/scrollkeeper/dtds"|g' + sed -i help/Makefile -e 's|--postvalid||g' + ''; doCheck = true; - meta = { - description = "GPS data editor and analyzer"; + postInstall = '' + wrapProgram $out/bin/viking \ + --prefix PATH : "${gpsbabel}/bin" + ''; + meta = with stdenv.lib; { + description = "GPS data editor and analyzer"; longDescription = '' Viking is a free/open source program to manage GPS data. You can import and plot tracks and waypoints, show Openstreetmaps @@ -35,9 +39,8 @@ stdenv.mkDerivation { on the map, make new tracks and waypoints, see real-time GPS position, etc. ''; - homepage = http://viking.sourceforge.net/; - - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch deleted file mode 100644 index 9bfe3831c4aa..000000000000 --- a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch +++ /dev/null @@ -1,57 +0,0 @@ -From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001 -From: Oliver Winker <oliver@oli1170.net> -Date: Tue, 12 Aug 2014 19:08:05 +0200 -Subject: [PATCH] Fix for openssl 1.0.1i - -Fixes following application error ---- -Errors -error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error ---- - -Due to openssl 1.0.1i change: ---- -commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291 -Author: Emilia Kasper <emilia@openssl.org> -Date: Wed Jul 2 19:02:33 2014 +0200 - - Fix OID handling: - - - Upon parsing, reject OIDs with invalid base-128 encoding. - - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function. - - CVE-2014-3508 - - Reviewed-by: Dr. Stephen Henson <steve@openssl.org> - Reviewed-by: Kurt Roeckx <kurt@openssl.org> - Reviewed-by: Tim Hudson <tjh@openssl.org> ---- ---- - lib/x509v3ext.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp -index cf74c32..d94cbda 100644 ---- a/lib/x509v3ext.cpp -+++ b/lib/x509v3ext.cpp -@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n) - x509v3ext::x509v3ext(const x509v3ext &n) - { - ext = NULL; -+ if (!n.isValid()) -+ return; - set(n.ext); - } - -@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const - - bool x509v3ext::isValid() const - { -- return ext->value->length > 0 && -+ return ext && ext->value && ext->value->length > 0 && - OBJ_obj2nid(ext->object) != NID_undef; - } - --- -2.0.1 - diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index d5fa5e5ec56d..76de3627630a 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { name = "xca-${version}"; - version = "0.9.3"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8"; + sha256 = "10rxma0zm7vryzv69m0aqlvmbf82d261wa77kxni4h3lndwqvpf2"; }; - patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ]; - - configurePhase = '' - export PATH=$PATH:${which}/bin - export QTDIR=${qt4} - prefix=$out ./configure ${openssl} ${libtool} - ''; - postInstall = '' wrapProgram "$out/bin/xca" \ --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib" diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 17df6492efa5..16aa67db30f6 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "46.0.2486.0"; - sha256 = "19p99lnmpizmhdlr73z43jjaip95kv5y6nj5yqni9dfbjnlb7cah"; - sha256bin32 = "1sxfszv50yw6vjd9mj9xc2crf51slsllhwnhlfp2qhg7l3f1l9a9"; - sha256bin64 = "0262jlpz4869w6nqc3aadygl5byldg5h8ivwwcz8v1dzjwm7nlhy"; + version = "47.0.2498.0"; + sha256 = "1dvp7wwfbdzyvbqcfn538gf0dk6w6gc88nms0wl0ir4ka7rf7mz1"; + sha256bin32 = "15jsmvhyzscf6g6czkg5vxzyj7vnkndmsapx0xf8hlw8d5zw3nq7"; + sha256bin64 = "1mx605dh93ak0p68rrpb6xf46jygggk0jwj7k6ks21l4wnxha8d5"; }; beta = { - version = "45.0.2454.46"; - sha256 = "14q5bsiw7ns4gwgpqlw8mcl500n13wq8v7p34v0gj2fazm948j37"; - sha256bin32 = "0cqw11sg4w665b50nybcg189wj78lr9h9amh5nqzi1qdqsk9vn8w"; - sha256bin64 = "1lm8ykpcbzcbmiyj2z35l6ypx1ahi7asqkzkdavnrqawjafskygc"; + version = "45.0.2454.78"; + sha256 = "1n3yp0jm3jqyw0xwji1451qjjpkvpsqabn7d2r9fj75gspsiwv6z"; + sha256bin32 = "11x8f2nyhf4n1jdd8npvr3ddkp3himi6lxpml64h5gjd5j9gf32b"; + sha256bin64 = "16gk14q3pc1fzg9dbwlqsay4jwddsh5b37h4p8zkqqymv9fp5qq9"; }; stable = { - version = "44.0.2403.157"; - sha256 = "1d7k74sa3qbwwcgi6zvx6z7mqkjvyh8x8h78d56nhhh80gyxb971"; - sha256bin32 = "0nqfb46299jhzsrlqfkjrj4g639hd4xdcj683pm0iszwq5mf9gbq"; - sha256bin64 = "02g1q1x1pwrbzd8v350bzwkqfgmsmq955bvif8sr0bi1sy9b16z3"; + version = "45.0.2454.85"; + sha256 = "14acjc80dmypybbvm087szp0g0m1gil5hjj02x8c6k7alsjh731y"; + sha256bin32 = "1945m765a05wfdfslrb22r1jpicyghfkf4h7ijzw1z9whmxa9y1v"; + sha256bin64 = "0d63akpr3yp128v01xgz1nd364w7p89gkvjpr4qz99q67dh3z1q1"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index d302e47f335b..b29cdec27e97 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "40.0.2"; + version = "40.0.3"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; } - { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; } - { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; } - { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; } - { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; } - { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; } - { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; } - { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; } - { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; } - { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; } - { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; } - { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; } - { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; } - { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; } - { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; } - { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; } - { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; } - { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; } - { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; } - { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; } - { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; } + { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; } + { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; } + { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; } + { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; } + { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; } + { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; } + { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; } + { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; } + { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; } + { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; } + { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; } + { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; } + { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; } + { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; } + { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; } + { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; } + { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; } + { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; } + { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; } + { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 2c433d12db55..12d581b15666 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -4,7 +4,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio -, enableGTK3 ? false +, enableGTK3 ? false, fetchpatch , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -16,16 +16,27 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null; -let version = "40.0.2"; in +let -stdenv.mkDerivation rec { - name = "firefox-${version}"; +common = { pname, version, sha1 }: stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "b5d79fa3684284bfeb7277e99c756b8688e8121d"; + inherit sha1; }; + patches = if !enableGTK3 then null else [(fetchpatch { + name = "crash_OTMC+GTK3.patch"; + # backported from 40.1 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1127752 + # https://bugzilla.redhat.com/show_bug.cgi?id=1256875 + url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/" + + "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1"; + sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5"; + })]; + patchFlags = "-p2"; + buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi @@ -80,7 +91,7 @@ stdenv.mkDerivation rec { '' mkdir ../objdir cd ../objdir - configureScript=../mozilla-release/configure + configureScript=../mozilla-*/configure ''; preInstall = @@ -97,14 +108,20 @@ stdenv.mkDerivation rec { # Remove SDK cruft. FIXME: move to a separate output? rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* '' + lib.optionalString enableGTK3 + # argv[0] must point to firefox itself '' wrapProgram "$out/bin/firefox" \ + --argv0 "$out/bin/.firefox-wrapped" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:" \ --suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + '' + + # some basic testing + '' + "$out/bin/firefox" --version ''; meta = { - description = "Web browser"; + description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; @@ -114,4 +131,20 @@ stdenv.mkDerivation rec { inherit gtk nspr version; isFirefox3Like = true; }; +}; + +in { + + firefox = common { + pname = "firefox"; + version = "40.0.3"; + sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13"; + }; + + firefox-esr = common { + pname = "firefox-esr"; + version = "38.2.1esr"; + sha1 = "c596174e7273be5079bf55aecde33ec191d99538"; + }; + } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 409f7d29ba2f..db51dc8b148b 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation { ${ lib.optionalString libtrick '' - sed -e "s@exec @exec -a '$out/bin/${browserName}${nameSuffix}' @" -i "$out/bin/${browserName}${nameSuffix}" libdirname="$(echo "${browser}/lib/${browserName}"*)" libdirbasename="$(basename "$libdirname")" mkdir -p "$out/lib/$libdirbasename" diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index dcc61d4061dd..518a4d667dda 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.10"; + version = "2.11"; name = "links2-${version}"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "0lqxg55sp1kphl7ykm2km0s2vsn92a0gmlgypmkqb984r060n3l4"; + sha256 = "0gqjdz1brdcx02mcwchi6bxy1i1ljbw5zpc6b321skrrsqkzkxw7"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index c61b0e8a70c9..65f9ef50f778 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes -, libXrender, libuuid, libXrandr, libXcomposite +, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio }: with stdenv.lib; @@ -10,7 +10,7 @@ let [gtk glib stdenv.cc.cc]; rpathPlugin = makeLibraryPath - [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite ]; + [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite libpulseaudio ]; in diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 527ddd99af1e..e5f813fcd7d5 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = http://www.openshift.org; maintainers = with maintainers; [offline]; platforms = [ "x86_64-linux" ]; + broken = true; }; } diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index 572deb62ba00..3dac10613625 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \; find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \; sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb" + # fix libv8 dependency + substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11" ''; configurePhase = '' diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix deleted file mode 100644 index 0af104fa380f..000000000000 --- a/pkgs/applications/networking/drive/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68"; - name = "drive-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/odeke-em/drive"; - src = fetchFromGitHub { - inherit rev; - owner = "odeke-em"; - repo = "drive"; - sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps"; - }; - - subPackages = [ "cmd/drive" ]; - - buildInputs = [ pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client cli-spinner oauth2 text net ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A tiny program to pull or push Google Drive files"; - homepage = https://github.com/odeke-em/drive; - license = licenses.asl20; - maintainers = with maintainers; [ bobvanderlinden ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 2e8a28d03c87..f57f48e357ac 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext -, pkgconfig, xdg_utils, gtk2, sqlite }: +, pkgconfig, xdg_utils, gtk2, sqlite, pugixml }: -let version = "3.12.0.2"; in +let version = "3.13.1"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "038xgvajn0nq1dzw1pac3xwhmil1y17vhadd2hx0vl4lrp16yabs"; + sha256 = "1iz82zqi1dqxm21ngmvh3sv97mj8069xy276gpv3yrmnyv4psvn1"; }; configureFlags = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite - ]; + pugixml ]; meta = with stdenv.lib; { homepage = http://filezilla-project.org/; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index addbc060977e..7bb14efc1bb5 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonPackage rec { name = "blink-${version}"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; - sha256 = "0vd4ky4djhrrlmfpz7g43bxjynhpql4d3s9jdirh21kc8d1bgayk"; + sha256 = "0lpc3gm0hk55m7i2hlmk2p76akcfvnqxg0hyamfhha90nv6fk7sf"; }; patches = [ ./pythonpath.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index 30d90ba302d4..e03b61b61824 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pidgin, unzip, glib, json_glib, nss, nspr, libgnome_keyring } : stdenv.mkDerivation rec { - name = "pidgin-opensteamworks-1.5.1"; + name = "pidgin-opensteamworks-${version}"; + version = "1.6.1"; - # Temporarily sourcing this from a mirror in my github account, until such time as the project is officially migrated away from the deprecated google code service src = fetchFromGitHub { - owner = "Shados"; + owner = "EionRobb"; repo = "pidgin-opensteamworks"; - rev = "4f0ea110a5bdba9d2b18ec8785b2edb276f0cccd"; - sha256 = "0gcrc1yaf29yjfhpflpn451i7isw8zc7maw77g604815myc5k025"; + rev = "${version}"; + sha256 = "6ab27831e454ad3b440e4f06b52e0b3671a4f8417ba4da3ab6f56c56d82cc29b"; }; preConfigure = "cd steam-mobile"; diff --git a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix index 99366da2c84f..b5bd22f88771 100644 --- a/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram-cli/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, libconfig, lua5_2, openssl, readline, zlib -, libevent, pkgconfig, python, jansson, bash +{ stdenv, fetchgit, bash, libconfig, libevent, openssl, + readline, zlib, lua5_2, python, pkgconfig, jansson }: stdenv.mkDerivation rec { @@ -11,14 +11,17 @@ stdenv.mkDerivation rec { rev = "2052f4b381337d75e783facdbfad56b04dec1a9c"; }; - buildInputs = [ libconfig lua5_2 openssl readline zlib libevent pkgconfig python jansson ]; + buildInputs = [ + libconfig libevent openssl readline zlib + lua5_2 python pkgconfig jansson + ]; installPhase = '' mkdir -p $out/bin cp ./bin/telegram-cli $out/bin/telegram-wo-key cp ./tg-server.pub $out/ cat > $out/bin/telegram-cli <<EOF #!${bash}/bin/sh - $out/bin/telegram-wo-key -k $out/tg-server.pub + $out/bin/telegram-wo-key -k $out/tg-server.pub "\$@" EOF chmod +x $out/bin/telegram-cli ''; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 8ff11dba9055..f8c025ba2418 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { (if webuiSupport then "" else "--disable-webui") ] ++ optional debugSupport "--enable-debug"; - enableParallelBuilding = true; + # https://github.com/qbittorrent/qBittorrent/issues/1992 + enableParallelBuilding = false; meta = { description = "Free Software alternative to µtorrent"; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index bf659816c4f3..b836e75132ca 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper -, openssl, curl, libevent, inotifyTools, systemd +, openssl, curl, libevent, inotify-tools, systemd , enableGTK3 ? false, gtk3 }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent inotifyTools ] + buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] ++ optional stdenv.isLinux systemd; diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix deleted file mode 100644 index 21d99013a1a0..000000000000 --- a/pkgs/applications/networking/pond/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, goPackages, fetchgit, trousers }: - -with goPackages; - -buildGoPackage rec { - rev = "f4e441c77a2039814046ff8219629c547fe8b689"; - name = "pond-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/agl/pond"; - src = fetchgit { - inherit rev; - url = "git://github.com/agl/pond.git"; - sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; - }; - - subPackages = [ "client" ]; - - buildInputs = [ trousers net crypto protobuf ed25519 govers ]; - - buildFlags = "--tags nogui"; - - dontInstallSrc = true; - - meta = with lib; { - description = "Forward secure, asynchronous messaging for the discerning"; - homepage = https://pond.imperialviolet.org; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix deleted file mode 100644 index 1ee9e71e782a..000000000000 --- a/pkgs/applications/networking/syncthing/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, fetchgit, goPackages }: - -with goPackages; - -buildGoPackage rec { - name = "syncthing-${version}"; - version = "0.11.21"; - goPackagePath = "github.com/syncthing/syncthing"; - src = fetchgit { - url = "git://github.com/syncthing/syncthing.git"; - rev = "refs/tags/v${version}"; - sha256 = "2e7faf1002570a64ef76c6bbdde781c550db6c45b30f4fa1c394102809cad977"; - }; - - subPackages = [ "cmd/syncthing" ]; - - buildFlagsArray = "-ldflags=-w -X main.Version v${version}"; - - preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; - - doCheck = true; - - dontInstallSrc = true; - - meta = { - homepage = http://syncthing.net/; - description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matejc theuni ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d603bf86537c..21551beb9dce 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -19,6 +19,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ] +, withHelp ? true }: let @@ -137,6 +138,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" "--with-lang=${langsSpaces}" + "${if withHelp then "" else "--without-help"}" + ); chmod a+x ./bin/unpack-sources @@ -182,13 +185,13 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" - substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=libreoffice" + substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=libreoffice" done mkdir -p "$out/share/desktop" - cp -r sysui/desktop/icons "$out/share/desktop" + cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop ''; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 2940569ef659..c45eb7d53d0c 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -31,5 +31,6 @@ in license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix new file mode 100644 index 000000000000..03ddf835343d --- /dev/null +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk }: + +stdenv.mkDerivation rec { + name = "geda-${version}"; + version = "1.8.2-20130925"; + + src = fetchurl { + url = "http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2.tar.gz"; + sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; + }; + + configureFlags = "--disable-update-xdg-database"; + buildInputs = [ pkgconfig guile gtk flex gawk ]; + + meta = with stdenv.lib; { + description = "Full GPL'd suite of Electronic Design Automation tools"; + homepage = http://www.geda-project.org/; + maintainers = with maintainers; [ pjones ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 86d7bfd84278..b50501a6d34c 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "232"; + version = "244"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "1cips2cb5wqxb6n2qi28af2ap1vhklqbhjy7pnifgz4dilkz10m8"; + sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq"; }; buildInputs = [ ocaml findlib camlp5 ]; diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix index 3231e2a7b806..eebe6ff0a06c 100644 --- a/pkgs/applications/science/logic/saw-tools/default.nix +++ b/pkgs/applications/science/logic/saw-tools/default.nix @@ -14,17 +14,17 @@ let saw-bin = if stdenv.system == "i686-linux" then fetchurl { - url = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-32.tar.gz"; - sha256 = "0hfb3a749fvwn33jnj1bgpk7v4pbvjjjffhafck6s8yz2sknnq4w"; + url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-32.tar.gz"; + sha256 = "126iag5nnvndi78c921z7vjrjfwcspn1hlxwwhzmqm4rvbhhr9v9"; } else fetchurl { - url = url + "/v0.1-dev/saw-0.1-dev-2015-06-09-CentOS6-64.tar.gz"; - sha256 = "1yz56kr8s0jcrfk1i87x63ngxip2i1s123arydnqq8myjyfz8id9"; + url = url + "/v0.1.1-dev/saw-0.1.1-dev-2015-07-31-CentOS6-64.tar.gz"; + sha256 = "07gyf319v6ama6n1aj96403as04bixi8mbisfy7f7va689zklflr"; }; in stdenv.mkDerivation rec { name = "saw-tools-${version}"; - version = "0.1-20150609"; + version = "0.1.1-20150731"; src = saw-bin; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 0700251c3a82..e810879eba60 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -63,5 +63,6 @@ rec { license = with a.lib.licenses; gpl2; homepage = "http://gap-system.org/"; + broken = true; }; }) x diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix new file mode 100644 index 000000000000..6bc5d874bc0d --- /dev/null +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool, pkgconfig, libqalculate, gtk, gnome2 }: +stdenv.mkDerivation rec { + name = "qalculate-gtk-${version}"; + version = "0.9.7"; + + src = fetchurl { + url = "mirror://sourceforge/qalculate/${name}.tar.gz"; + sha256 = "0b986x5yny9vrzgxlbyg80b23mxylxv2zz8ppd9svhva6vi8xsm4"; + }; + + nativeBuildInputs = [ intltool pkgconfig ]; + buildInputs = [ libqalculate gtk gnome2.libglade gnome2.libgnome gnome2.scrollkeeper ]; + + meta = with stdenv.lib; { + description = "The ultimate desktop calculator"; + homepage = http://qalculate.sourceforge.net; + maintainers = with maintainers; [ gebner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 57d9fc40ab50..e61cb557e123 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran +{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, mesa, gfortran , libX11,libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1bkiggcyya39a794d3d2rzzmmkbdymf86hbqhh0l1pl4f38xvp6i"; }; - buildInputs = [ cmake gfortran mesa libX11 libXpm libXft libXext zlib ]; + buildInputs = [ cmake pkgconfig gfortran mesa libX11 libXpm libXft libXext zlib ]; + + NIX_CFLAGS_LINK = "-lX11"; # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in # <rootsrc>/cmake/modules/RootBuildOptions.cmake. diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix deleted file mode 100644 index e8a4f2b31564..000000000000 --- a/pkgs/applications/science/programming/kframework/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ stdenv, fetchFromGitHub, maven, openjdk8, releaseTools }: - -# TODO: -# - Investigate builds on platforms other than 64-bit linux -# - Separate package for Maven cache? This would speed up builds and -# theoretically could still be pure -# - Find a way to prevent Maven from downloading artifacts irrelevant -# to the platform for which we are building - -releaseTools.mvnBuild rec { - name = "kframework-20150415"; - - mvn8 = maven.override { - jdk = openjdk8; # K uses Java 8. The official docs reference the - # Oracle VM, but it's been working with OpenJDK - }; - - src = fetchFromGitHub { - owner = "kframework"; - repo = "k"; - rev = "85a41bc024"; # nightly build for April 15th, 2015 - sha256 = "01ndfdnqxp2w86pg3ax39sxayb2pfm39lj1h3818zzn86gqwa1vc"; - }; - - buildInputs = [ mvn8 openjdk8 ]; - - preSetupPhase = '' - # z3 needs this to pass tests - export LD_LIBRARY_PATH=$(cat $NIX_CC/nix-support/orig-cc)/lib - # not sure if this does anything, since it might only speed up incremental builds - export MAVEN_OPTS="-XX:+TieredCompilation" - ''; - - mvnAssembly = '' - mvn package -Dcheckstyle.skip -Dmaven.test.skip=true -Dmaven.repo.local=$M2_REPO - ''; - - mvnRelease = '' - true # do nothing, since mvn package is sufficient - ''; - - # this is a custom version of k-distribution/src/main/scripts/lib/k - kscript = '' - #!/usr/bin/env bash - export JAVA=${openjdk8}/bin/java - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$out/lib" - - export K_OPTS="-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation" - export MISC_ARGS="-Djava.awt.headless=true" - export ARGS="$MISC_ARGS $K_OPTS" - $JAVA $ARGS -cp "$out/share/kframework/lib/java/*" org.kframework.main.Main "$@" - ''; - - finalPhase = '' - # set some environment variables - export K_ROOT=$PWD/k-distribution/target/release/k/ - export K_SHARE=$out/share/kframework/ - # make requisite directories - mkdir -p $out/lib $K_SHARE/lib/native - # copy over bin - cp -R $K_ROOT/bin $K_SHARE/ - # symlink $out/bin to $out/share/kframework/bin - ln -s $K_SHARE/bin $out/bin - # copy everything relevant to $out/share/kframework - # we may want to consider adding the documentation etc. - cp -R $K_ROOT/include $K_SHARE/ - cp -R $K_ROOT/lib/java $K_SHARE/lib/ - cp -R $K_ROOT/lib/native/linux $K_SHARE/lib/native/ - cp -R $K_ROOT/lib/native/linux64 $K_SHARE/lib/native/ - # remove Windows batch scripts - rm $K_SHARE/bin/*.bat # */ - # TODO: fix these scripts so they work - rm $K_SHARE/bin/kserver $K_SHARE/bin/stop-kserver - # make our k wrapper script and substitute $out for its value - echo -n "$kscript" | sed "s:\$out:$out:g" > $K_SHARE/lib/k - chmod +x $K_SHARE/lib/k - # symlink requisite binaries - ln -s $K_SHARE/lib/k $out/lib/k - ln -s $K_SHARE/lib/native/linux/sdf2table $out/bin/sdf2table - ln -s $K_SHARE/lib/native/linux64/z3 $out/bin/z3 - ln -s $K_SHARE/lib/native/linux64/libz3.so $out/lib/libz3.so - ln -s $K_SHARE/lib/native/linux64/libz3java.so $out/lib/libz3java.so - # patch Z3 so it uses the right interpreter/libs - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib \ - --force-rpath \ - $K_SHARE/lib/native/linux64/z3 - ''; - - meta = { - description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined"; - homepage = http://www.kframework.org; - license = stdenv.lib.licenses.bsd3; # technically it is the UIUC/NCSA license - # but LLVM uses that license as well and - # it is marked as BSD3 - maintainers = [ stdenv.lib.maintainers.taktoa ]; - platforms = stdenv.lib.platforms.linux; # I haven't done testing on other OSes, but - # since it's Java it should run anywhere - }; -} diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 806d2f546cf5..c068847c331b 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -8,12 +8,13 @@ }: buildPythonPackage rec { - name = "spyder-2.2.5"; + name = "spyder-${version}"; + version = "2.3.6"; namePrefix = ""; src = fetchurl { - url = "https://spyderlib.googlecode.com/files/${name}.zip"; - sha256 = "1bxc5qs2bqc21s6kxljsfxnmwgrgnyjfr9mkwzg9njpqsran3bp2"; + url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip"; + sha256 = "0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2"; }; buildInputs = [ unzip ]; @@ -23,6 +24,11 @@ buildPythonPackage rec { # There is no test for spyder doCheck = false; + # Use setuptools instead of distutils. + preConfigure = '' + export USE_SETUPTOOLS=True + ''; + desktopItem = makeDesktopItem { name = "Spyder"; exec = "spyder"; @@ -49,7 +55,7 @@ buildPythonPackage rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = https://code.google.com/p/spyderlib/; + homepage = https://github.com/spyder-ide/spyder/; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 15035a345d4e..62a58ee985c0 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { preBuild = '' makeFlagsArray=( XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + LIBS="" prefix="$out" ) ''; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index b8bce1c9eb56..85219e48449e 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -96,6 +96,8 @@ rec { gitflow = callPackage ./gitflow { }; + git-radar = callPackage ./git-radar { }; + git-remote-hg = callPackage ./git-remote-hg { }; gitRemoteGcrypt = callPackage ./git-remote-gcrypt { }; diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix new file mode 100644 index 000000000000..5cca8ebef3c7 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub}: + +stdenv.mkDerivation rec { + name = "git-radar-${version}"; + version = "0.3.2"; + + phases = [ "unpackPhase" "installPhase" ]; + + dontInstallSrc = true; + + src = fetchFromGitHub { + owner = "michaeldfallen"; + repo = "git-radar"; + rev = "v${version}"; + sha256 = "1028462b4kqxx66vjv7r8nnr6bi3kw11fixpqyg2srqriha6447p"; + }; + + installPhase = '' + mkdir -p $out/bin + cp git-radar fetch.sh prompt.bash prompt.zsh radar-base.sh $out + ln -s $out/git-radar $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/michaeldfallen/git-radar; + license = licenses.mit; + description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo."; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ kamilchm ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index dde5b7cc603a..fce2d07c9eea 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.5.0"; + version = "2.5.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0p747j94kynrx71qaamc9i0dkq5vqpv66a47b68pmin1qsxb2nfc"; + sha256 = "03r2shbya0g3adya336jpc6kcn2s0fmn5p5bs1s8q6r232qvgkmk"; }; patches = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 5026efb71751..62f2cc80d6fd 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -3,7 +3,7 @@ , ApplicationServices }: let - version = "3.4.2"; + version = "3.5.1"; name = "mercurial-${version}"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "1kcfznv990mj30y4yk59hz4wkd3050h0hg7iib69w53nhi50xjfw"; + sha256 = "1795ia6ghbqwfp4d6bz0qwlvzymh76zdgk2viikrkqq3ldfs8zcr"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 26ca2ad9748c..3a8df10f1661 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -45,13 +45,7 @@ in stdenv.mkDerivation rec { mkdir -p vendor/cache ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} - bundle config build.nokogiri \ - --use-system-libraries \ - --with-iconv-dir=${libiconv} \ - --with-xslt-dir=${libxslt} \ - --with-xml2-dir=${libxml2} \ - --with-pkg-config \ - --with-pg-config=${postgresql}/bin/pg_config + bundle config build.nokogiri --use-system-libraries --with-iconv-dir="${libiconv}" --with-xslt-dir="${libxslt}" --with-xml2-dir="${libxml2}" bundle install --verbose --local --deployment diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index ccea8ffb3f27..40a3a3f9ae52 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -6,18 +6,13 @@ , which }: -let - the_version = "6_5_9"; - -in - stdenv.mkDerivation rec { - name = "smartgithg-${the_version}"; + name = "smartgithg-${version}"; + version = "7_0_0"; src = fetchurl { - url = "http://www.syntevo.com/downloads/smartgit/" + - "smartgit-generic-${the_version}.tar.gz"; - sha256 = "09bvx1jgaqfxg8qv9f306bgh3k057shsi2xllxv1vw3xf0pvkbwa"; + url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz"; + sha256 = "099hnpczh2c0s86nsdybymmm4903n0bsjdq1fpdmm0x5w4216iy6"; }; buildInputs = [ diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 0dbf42713831..e3f586a3a0f2 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -17,11 +17,11 @@ assert legacyGUI -> wxGTK != null; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "7.9.0"; + version = "8.3.0"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0jmsgfkxrnplpmwlzynqdb4xf3x1z3dminz97gmddswwgnjqyy1r"; + sha256 = "0dzwmwa76y4nhb5brp5a1kxgxjr71czd8vj218qmrlwm54i85gc7"; }; patchPhase = '' diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix index 45d8c452111f..41d8b5a577db 100644 --- a/pkgs/applications/video/popcorntime/default.nix +++ b/pkgs/applications/video/popcorntime/default.nix @@ -1,48 +1,39 @@ -{ lib, stdenv, fetchurl, runCommand, makeWrapper, node_webkit_0_9, - fromCi ? true, - build ? "652", - version ? if fromCi then "0.3.7-2-0ac62b848" else "0.3.7.2" -}: +{ lib, stdenv, fetchurl, runCommand, makeWrapper, nwjs, zip }: let - config = - if stdenv.system == "x86_64-linux" then - {sys = "Linux32"; - sha256 = - if fromCi then "06av40b68xy2mv2fp9qg8npqmnvkl00p2jvbm2fdfnpc9jj746iy" - else "0lm9k4fr73a9p00i3xj2ywa4wvjf9csadm0pcz8d6imwwq44sa8b"; - } - else if stdenv.system == "i686-linux" then - {sys = "Linux64"; - sha256 = - if fromCi then "1nr2zaixdr5vqynga7jig3fw9dckcnzcbdmbr8haq4a486x2nq0f" - else "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr91"; - } - else throw "Unsupported system ${stdenv.system}"; - - fetchurlConf = - let - ciBase = "https://ci.popcorntime.io/job/Popcorn-Experimental/652/artifact/build/releases/Popcorn-Time"; - relBase = "https://get.popcorntime.io/build"; - in { - url = - if fromCi then "${ciBase}/${lib.toLower config.sys}/Popcorn-Time-${version}-${config.sys}.tar.xz" - else "${relBase}/Popcorn-Time-${version}-Linux64.tar.xz"; - sha256 = config.sha256; - }; + version = "0.3.8-3"; popcorntimePackage = stdenv.mkDerivation rec { - name = - if fromCi then "popcorntime-git-2015-07-07" - else "popcorntime-${version}"; - src = fetchurl fetchurlConf; + name = "popcorntime-${version}"; + src = if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://get.popcorntime.io/build/Popcorn-Time-${version}-Linux-64.tar.xz"; + sha256 = "0q8c6m9majgv5a6hjl1b2ndmq4xx05zbarsydhqkivhh9aymvxgm"; + } + else if stdenv.system == "i686-linux" then + fetchurl { + url = "https://get.popcorntime.io/build/Popcorn-Time-${version}-Linux-32.tar.xz"; + sha256 = "1dz1cp31qbwamm9pf8ydmzzhnb6d9z73bigdv3y74dgicz3dpr92"; + } + else throw "Unsupported system ${stdenv.system}"; + sourceRoot = "."; + + buildInputs = [ zip ]; + + buildPhase = '' + rm Popcorn-Time install + zip -r package.nw package.json src node_modules + cat ${nwjs}/bin/nw package.nw > Popcorn-Time + chmod 555 Popcorn-Time + ''; + installPhase = '' mkdir -p $out - cp -r *.so *.pak $out/ - cat ${node_webkit_0_9}/bin/nw package.nw > $out/Popcorn-Time - chmod 555 $out/Popcorn-Time + cp -r * $out/ ''; + + dontPatchELF = true; }; in runCommand "popcorntime-${version}" { diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b915e744358c..2363ccd910b1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, -btrfsProgs, iptables, bash, e2fsprogs, xz}: +btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}: + +# https://github.com/docker/docker/blob/master/project/PACKAGERS.md stdenv.mkDerivation rec { name = "docker-${version}"; @@ -16,6 +18,11 @@ stdenv.mkDerivation rec { dontStrip = true; + preConfigure = '' + mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go} + sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go + ''; + buildPhase = '' patchShebangs . export AUTO_GOPATH=1 @@ -26,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit - makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin" + makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 465819949108..a5d403457de0 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libseccomp, libaio, libcap_ng, gnutls, nettle +, libseccomp, libaio, libcap_ng, gnutls , makeWrapper , pulseSupport ? true, libpulseaudio , sdlSupport ? true, SDL @@ -11,7 +11,7 @@ with stdenv.lib; let - n = "qemu-2.4.0"; + n = "qemu-2.2.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j"; + sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6"; }; buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp - libcap_ng gnutls nettle + libcap_ng gnutls ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL ] diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch index 833f030bed35..81d29feea3de 100644 --- a/pkgs/applications/virtualization/qemu/no-etc-install.patch +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -1,11 +1,14 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 --- a/Makefile +++ b/Makefile -@@ -418,7 +418,7 @@ +@@ -384,8 +384,7 @@ install-confdir: + install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" - - install: all $(if $(BUILD_DOCS),install-doc) \ +-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ -install-datadir install-localstatedir -+install-datadir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir ifneq ($(TOOLS),) $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) endif diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 71aa7a710f9e..1d03eece46c8 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -1,7 +1,10 @@ { stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio -, fetchFromGitHub }: +, fetchurl, fetchFromGitHub }: -stdenv.mkDerivation rec { +let + coreosImageRelease = "738.1.0"; + +in stdenv.mkDerivation rec { version = "0.8.0"; name = "rkt-${version}"; @@ -12,17 +15,29 @@ stdenv.mkDerivation rec { sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0"; }; + stage1image = fetchurl { + url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; + sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0"; + }; + buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; - + preConfigure = '' ./autogen.sh ''; + preBuild = '' + # hack to avoid downloading image during build, this has been + # improved in rkt master + mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos + cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img + ''; + installPhase = '' mkdir -p $out/bin cp -Rv build-rkt-${version}/bin/* $out/bin ''; - + meta = with lib; { description = "A fast, composable, and secure App Container runtime for Linux"; homepage = http://rkt.io; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9112337d0a46..532e20b9444e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -14,7 +14,7 @@ with stdenv.lib; let buildType = "release"; - version = "5.0.0"; # changes ./guest-additions as well + version = "5.0.2"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -60,7 +60,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "bb71356c8f82012c9b5ae16e12302eb111c71ae7b063ada7688fbfa8aa10c2f7"; + sha256 = "f290c220d62af2a7fdabb1934c1a0b924b68968a236bb2509bcb507d2c19485e"; }; buildInputs = diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6bf0ef2e8258..27c744234c49 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "7b61f523db7ba75aebc4c7bb0cae2da92674fa72299e4a006c5c67517f7d786b"; + sha256 = "1qikn5w6j85fh7ynnfnm4yydii9xb0smv9bvsxnpkpkvkk566h4p"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch index 1eb3d5949de2..339972a2cdeb 100644 --- a/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch +++ b/pkgs/applications/virtualization/xen/0000-qemu-seabios-enable-ATA_DMA.patch @@ -1,8 +1,7 @@ -diff --git a/src/Kconfig b/src/Kconfig -index 45ca59c..faf8951 100644 ---- a/src/Kconfig -+++ b/src/Kconfig -@@ -144,13 +144,13 @@ menu "Hardware support" +diff -uNr a/src/Kconfig b/src/Kconfig +--- a/src/Kconfig 2015-08-31 10:15:13.231134858 +0200 ++++ b/src/Kconfig 2015-08-31 10:14:24.039180178 +0200 +@@ -144,13 +144,13 @@ config ATA_DMA depends on ATA bool "ATA DMA" @@ -16,8 +15,5 @@ index 45ca59c..faf8951 100644 - default n + default y help - Use 32bit PIO accesses on ATA (minor optimization on PCI -transfers). + Use 32bit PIO accesses on ATA (minor optimization on PCI transfers). config AHCI --- -1.7.10.4 diff --git a/pkgs/applications/virtualization/xen/4.4.1.nix b/pkgs/applications/virtualization/xen/4.4.1.nix deleted file mode 100644 index ec2056cc5475..000000000000 --- a/pkgs/applications/virtualization/xen/4.4.1.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -let - # Xen 4.4.1 - xenConfig = { - name = "xen-4.4.1"; - version = "4.4.1"; - - src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/4.4.1/xen-4.4.1.tar.gz"; - sha256 = "09gaqydqmy64s5pqnwgjyzhd3wc61xyghpqjfl97kmvm8ly9vd2m"; - }; - - # Sources needed to build the xen tools and tools/firmware. - toolsGits = - [ # tag qemu-xen-4.4.1 - { git = { name = "qemu-xen"; - url = git://xenbits.xen.org/qemu-upstream-4.4-testing.git; - rev = "65fc9b78ba3d868a26952db0d8e51cecf01d47b4"; - sha256 = "e24fb58f773fd9134c5aae6d3ca7e9f754dc9822de92b1eb2cedc76faf911f18"; - }; - } - # tag xen-4.4.1 - { git = { name = "qemu-xen-traditional"; - url = git://xenbits.xen.org/qemu-xen-4.4-testing.git; - rev = "6ae4e588081620b141071eb010ec40aca7e12876"; - sha256 = "b1ed1feb92fbe658273a8d6d38d6ea60b79c1658413dd93979d6d128d8554ded"; - }; - } - ]; - - firmwareGits = - [ # tag 1.7.3.1 - { git = { name = "seabios"; - url = git://xenbits.xen.org/seabios.git; - rev = "7d9cbe613694924921ed1a6f8947d711c5832eee"; - sha256 = "c071282bbcb1dd0d98536ef90cd1410f5d8da19648138e0e3863bc540d954a87"; - }; - } - { git = { name = "ovmf"; - url = git://xenbits.xen.org/ovmf.git; - rev = "447d264115c476142f884af0be287622cd244423"; - sha256 = "7086f882495a8be1497d881074e8f1005dc283a5e1686aec06c1913c76a6319b"; - }; - } - ]; - - }; - -in callPackage ./generic.nix (args // { xenConfig=xenConfig; }) diff --git a/pkgs/applications/virtualization/xen/4.5.0.nix b/pkgs/applications/virtualization/xen/4.5.0.nix index 156255be0d75..48b3ee4d75b1 100644 --- a/pkgs/applications/virtualization/xen/4.5.0.nix +++ b/pkgs/applications/virtualization/xen/4.5.0.nix @@ -58,17 +58,18 @@ let } ]; - xenserverPatches = let - patches = { - url = https://github.com/ts468/xen-4.5.pg.git; - rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; - sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; - }; + xenserverPatches = + let + patches = { + url = https://github.com/ts468/xen-4.5.pg.git; + rev = "3442b65b490f43c817cbc53369220d0b1ab9b785"; + sha256 = "31436c15def0a300b3ea1a63b2208c4a3bcbb143db5c6488d4db370b3ceeb845"; + }; in '' cp -r ${fetchgit patches}/master patches quilt push -a substituteInPlace tools/xenguest/Makefile --replace "_BSD_SOURCE" "_DEFAULT_SOURCE" - ''; + ''; xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 32e385635250..2ff66d843cad 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -76,7 +76,32 @@ stdenv.mkDerivation { pythonPath = [ pythonPackages.curses ]; patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches; - patchPhase = stdenv.lib.optional ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches; + + postPatch = '' + ${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches} + + # Xen's tools and firmares need various git repositories that it + # usually checks out at time using git. We can't have that. + ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in '' + cp -r ${src} tools/${src.name}-dir-remote + chmod -R +w tools/${src.name}-dir-remote + '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) '' + ( cd tools/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} ) + '')} + ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x.git; in '' + cp -r ${src} tools/firmware/${src.name}-dir-remote + chmod -R +w tools/firmware/${src.name}-dir-remote + '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) '' + ( cd tools/firmware/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} ) + '')} + + # Xen's stubdoms and firmwares need various sources that are usually fetched + # at build time using wget. We can't have that, so we prefetch Xen's ext_files. + mkdir xen_ext_files + ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in '' + cp ${src} xen_ext_files/${src.name} + '')} + ''; preConfigure = '' # Fake wget: copy prefetched downloads instead @@ -89,13 +114,7 @@ stdenv.mkDerivation { export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio" ''; - # TODO: Flask needs more testing before enabling it by default. - #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; - makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; - - buildFlags = "xen tools stubdom"; - - preBuild = + postConfigure = '' substituteInPlace tools/libfsimage/common/fsimage_plugin.c \ --replace /usr $out @@ -113,7 +132,10 @@ stdenv.mkDerivation { substituteInPlace tools/xenstat/Makefile \ --replace /usr/include/curses.h ${ncurses}/include/curses.h - substituteInPlace tools/ioemu-qemu-xen/xen-hooks.mak \ + substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \ + --replace /usr/include/pci ${pciutils}/include/pci + + substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \ --replace /usr/include/pci ${pciutils}/include/pci substituteInPlace tools/hotplug/Linux/xen-backend.rules \ @@ -127,18 +149,6 @@ stdenv.mkDerivation { substituteInPlace xen/Makefile \ --replace '$(CC) $(CFLAGS) -v' '$(CC) -v' - substituteInPlace tools/python/xen/xend/server/BlktapController.py \ - --replace /usr/sbin/tapdisk2 $out/sbin/tapdisk2 - - substituteInPlace tools/python/xen/xend/XendQCoWStorageRepo.py \ - --replace /usr/sbin/qcow-create $out/sbin/qcow-create - - substituteInPlace tools/python/xen/remus/save.py \ - --replace /usr/lib/xen/bin/xc_save $out/${libDir}/xen/bin/xc_save - - substituteInPlace tools/python/xen/remus/device.py \ - --replace /usr/lib/xen/bin/imqebt $out/${libDir}/xen/bin/imqebt - # Allow the location of the xendomains config file to be # overriden at runtime. substituteInPlace tools/hotplug/Linux/init.d/xendomains \ @@ -150,33 +160,17 @@ stdenv.mkDerivation { substituteInPlace tools/hotplug/Linux/xendomains \ --replace /bin/ls ls - # Xen's tools and firmares need various git repositories that it - # usually checks out at time using git. We can't have that. - ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in '' - cp -r ${src} tools/${src.name}-dir-remote - chmod -R +w tools/${src.name}-dir-remote - '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) '' - ( cd tools/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} ) - '')} - ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x.git; in '' - cp -r ${src} tools/firmware/${src.name}-dir-remote - chmod -R +w tools/firmware/${src.name}-dir-remote - '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) '' - ( cd tools/firmware/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} ) - '')} - - # Xen's stubdoms and firmwares need various sources that are usually fetched - # at build time using wget. We can't have that, so we prefetch Xen's ext_files. - mkdir xen_ext_files - ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in '' - cp ${src} xen_ext_files/${src.name} - '')} - # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir -p tools/include/gnu touch tools/include/gnu/stubs-32.h ''; + # TODO: Flask needs more testing before enabling it by default. + #makeFlags = "XSM_ENABLE=y FLASK_ENABLE=y PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + makeFlags = "PREFIX=$(out) CONFIG_DIR=/etc XEN_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files "; + + buildFlags = "xen tools stubdom"; + postBuild = '' make -C docs man-pages diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index b5029d3c1416..b81649050bef 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "i3-${version}"; - version = "4.10.2"; + version = "4.10.3"; src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; - sha256 = "1n6grkpv5rsn9zgg8if76mmg85w1asbm3rpplxyn6fzr8wds7587"; + sha256 = "1lq7h4w7m0hi31iva8g7yf1sc11ispnknxjdaj9agld4smxqb44j"; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 91fff3335ec2..099a2523fb4d 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -2,11 +2,11 @@ pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - name = "i3lock-2.6"; + name = "i3lock-2.7"; src = fetchurl { url = "http://i3wm.org/i3lock/${name}.tar.bz2"; - sha256 = "0aj0an8fwv66jhda499r3xa00546cc9ja1dk8xpc6sy6xygqjbf0"; + sha256 = "1qlgafbyqjpqdfs50f2y0xphn2jdigafkqqsmpikk97cs0z1i0k8"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple screen locker like slock"; homepage = http://i3wm.org/i3lock/; - maintainers = with maintainers; [ garbas malyn ]; + maintainers = with maintainers; [ garbas malyn iElectric ]; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix new file mode 100644 index 000000000000..a7d492a05dc8 --- /dev/null +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchhg, pkgconfig, libixp_hg, txt2tags, dash, python +, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: + +stdenv.mkDerivation rec { + rev = "2823"; + version = "hg-2012-12-09"; + name = "wmii-${version}"; + + src = fetchhg { + url = https://code.google.com/p/wmii/; + sha256 = "1wqw41jb2fhq902a04ixfzmx0lia1pawahm1ymyrs3is6mm32r51"; + inherit rev; + }; + + # for dlopen-ing + patchPhase = '' + substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "${libXft}/lib/libXft.so" + ''; + + configurePhase = '' + for file in $(grep -lr '#!.*sh'); do + sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file + done + + cat <<EOF >> config.mk + PREFIX = $out + LIBIXP = ${libixp_hg}/lib/libixp.a + BINSH = ${dash}/bin/dash + EOF + ''; + + buildInputs = [ pkgconfig libixp_hg txt2tags dash python + libX11 libXrender libXext libXinerama libXrandr libXft ]; + + # For some reason including mercurial in buildInputs did not help + makeFlags = "WMII_HGVERSION=hg${rev}"; + + meta = { + homepage = "https://code.google.com/p/wmii/"; + description = "A small window manager controlled by a 9P filesystem"; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = stdenv.lib.licenses.mit; + inherit version; + }; +} diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix deleted file mode 100644 index e8ecc72a6d30..000000000000 --- a/pkgs/applications/window-managers/wmii/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "wmii-3.6"; - - src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.6.tar.gz; - sha256 = "46f39b788c5ef4695040b36cc7d9c539db0306bafc4d8cefdc5980ed4331b216"; - }; - - buildInputs = [ libX11 libixp xextproto libXt libXext ]; - inherit libixp; - - phases = "unpackPhase installPhase"; - - installPhase = " - for i in libfmt libutf libregexp libbio; do - cd $i; make; cd .. - done - mkdir -p \$out/lib - cp ${libixp}/lib/libixp.a \$out/lib - export CFLAGS=\$NIX_CFLAGS_COMPILE - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - -e 's%^\\(AWKPATH = \\).*%\\1${gawk}/bin/gawk%' \\ - config.mk - # don't use the default one installed by nixos! - #sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir - make install - "; - meta = { homepage = "www.suckless.org"; - description = "a really cool window manager which can by driven by keyboard only"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix deleted file mode 100644 index 568be30f1c52..000000000000 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -args: with args; stdenv.mkDerivation { - name = "wmiimenu-3.1"; - - src = fetchurl { - url = http://dl.suckless.org/wmii/wmii-3.1.tar.gz; - sha256 = "0sviwxbanpsfdm55zvx9hflncw35slkz41xr517y3yfgxx6qlhlk"; - }; - - buildInputs = [ libX11 libixp ]; - inherit libixp; - - phases = "unpackPhase installPhase"; - - installPhase = " - export CFLAGS=\$NIX_CFLAGS_COMPILE - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCS.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk - # don't use the default one installed by nixos! - # sed -i -e \"s%ixpc%\$libixp/bin/ixpc%\" wmiir - - # This will fail but wmiimenu has been built (hack!) - set +e - make &> /dev/null - set -e - mkdir -p \$out/bin - cp cmd/wmiimenu \$out/bin - "; - meta = { homepage = "www.suckless.org"; - description = "One small tool of the wmii window manger to let the user select an item from a list by filtering"; - license = stdenv.lib.licenses.mit; - }; -} diff --git a/pkgs/applications/window-managers/xmonad/wrapper.nix b/pkgs/applications/window-managers/xmonad/wrapper.nix index cb02a214d5bb..e8dc0b1fdac7 100644 --- a/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -13,4 +13,8 @@ in stdenv.mkDerivation { --set NIX_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; + + # trivial derivation + preferLocalBuild = true; + allowSubstitutes = false; } diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 2f6a4d36327c..14b4d6fc9a27 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -173,6 +173,7 @@ rec { # Debian. debian = [ + http://httpredir.debian.org/debian/ ftp://ftp.au.debian.org/debian/ ftp://ftp.de.debian.org/debian/ ftp://ftp.es.debian.org/debian/ @@ -280,6 +281,7 @@ rec { http://archive.apache.org/dist/ # fallback for old releases ftp://ftp.funet.fi/pub/mirrors/apache.org/ http://apache.cs.uu.nl/dist/ + http://apache.cs.utah.edu/ ]; postgresql = [ diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 713f4cdc83e8..f26291e7daae 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -85,7 +85,7 @@ let let boolToKernOpt = b: if b then "y" else "n"; # Disable RANDSTRUCT under virtualbox, as it has some kind of # breakage with the vbox guest drivers - #randstruct = optionalString config.services.virtualboxGuest.enable + #randstruct = optionalString config.virtualisation.virtualbox.guest.enable # "GRKERNSEC_RANDSTRUCT n"; # Disable restricting links under the testing kernel, as something diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index f474ff5e88ed..5150b4f0218a 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -2,7 +2,7 @@ makeWrapper() { local original=$1 local wrapper=$2 local params varName value command separator n fileNames - local flagsBefore flags + local argv0 flagsBefore flags mkdir -p "$(dirname $wrapper)" @@ -68,11 +68,17 @@ makeWrapper() { n=$((n + 1)) flagsBefore="$flagsBefore $flags" fi + + if test "$p" = "--argv0"; then + argv0=${params[$((n + 1))]} + n=$((n + 1)) + fi done # Note: extraFlagsArray is an array containing additional flags # that may be set by --run actions. - echo exec -a '"$0"' "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper + echo exec ${argv0:+-a $argv0} "$original" \ + $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper chmod +x $wrapper } @@ -98,5 +104,5 @@ wrapProgram() { local prog="$1" local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped mv $prog $hidden - makeWrapper $hidden $prog "$@" + makeWrapper $hidden $prog --argv0 '"$0"' "$@" } diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 450971524e61..a4e228d7de14 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,26 +1,59 @@ -{ stdenv, fetchurl, mkfontdir, mkfontscale }: +{ stdenv, fetchurl, mkfontdir, mkfontscale, bdf2psf }: stdenv.mkDerivation rec { name = "gohufont-2.0"; - src = fetchurl { + pcf = fetchurl { url = "http://font.gohu.org/gohufont-2.0.tar.gz"; sha256 = "0vi87fvj3m52piz2k6vqday03cah6zvz3dzrvjch3qjna1i1nb7s"; }; - buildInputs = [ mkfontdir mkfontscale ]; + bdf = fetchurl { + url = "http://font.gohu.org/gohufont-bdf-2.0.tar.gz"; + sha256 = "0rqqavhqbs7pajcblg92mjlz2dxk8b60vgdh271axz7kjs2wf9mr"; + }; + + buildInputs = [ mkfontdir mkfontscale bdf2psf ]; + + unpackPhase = '' + mkdir pcf bdf + tar -xzf $pcf --strip-components=1 -C pcf + tar -xzf $bdf --strip-components=1 -C bdf + ''; installPhase = '' + # convert bdf to psf fonts + sourceRoot="$(pwd)" + mkdir psf + + cd "${bdf2psf}/usr/share/bdf2psf" + for i in $sourceRoot/bdf/*.bdf; do + bdf2psf --fb $i standard.equivalents \ + ascii.set+useful.set+linux.set 512 \ + "$sourceRoot/psf/$(basename $i .bdf).psf" + done + cd "$sourceRoot" + + # install the psf fonts (for the virtual console) + fontDir="$out/share/consolefonts" + mkdir -p "$fontDir" + mv psf/*.psf "$fontDir" + + + # install the pcf fonts (for xorg applications) fontDir="$out/share/fonts/misc" mkdir -p "$fontDir" - mv *.pcf.gz "$fontDir" + mv pcf/*.pcf.gz "$fontDir" + cd "$fontDir" mkfontdir mkfontscale ''; meta = with stdenv.lib; { - description = "A monospace bitmap font well suited for programming and terminal use"; + description = '' + A monospace bitmap font well suited for programming and terminal use + ''; homepage = http://font.gohu.org/; license = licenses.wtfpl; maintainers = with maintainers; [ epitrochoid ]; diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 4156fb69069f..63f5edb4c38b 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pecita-${version}"; - version = "5.1"; + version = "5.2"; src = fetchurl { url = "http://pecita.eu/b/Pecita.otf"; - sha256 = "0v2k6vvzl1f809h3lfld6zy5m56w1dn27xmdy3hjniv6j9xbhbs4"; + sha256 = "1zawd83jrvzxfj5n5m65ja6rcl0w4bm4179g053b0icm152lgmns"; }; phases = ["installPhase"]; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 795299892ed7..407a781ca53a 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -8,29 +8,29 @@ let # Annoyingly, these files are updated without a change in URL. This means that # builds will start failing every month or so, until the hashes are updated. - version = "2015-08-24"; + version = "2015-09-08"; in stdenv.mkDerivation { name = "geolite-legacy-${version}"; srcGeoIP = fetchDB "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz" - "04r1jir9xpd1h5z0a58mwdsbfdbf2kap0ac498w05i11j4vrlh5n"; + "11xv6ws0gzyj9bf1j1g67cklkkl6s4wb6z6n7kxjcxnn2274nfy0"; srcGeoIPv6 = fetchDB "GeoIPv6.dat.gz" "GeoIPv6.dat.gz" - "0vr2a4mlqlaxq3jz8282zygb2y5hx7y660yrjcq02rpmgpmaxkrd"; + "1q5vgk522wq5ybhbw86zk8njgg611kc46a22vkrp08vklbni3akz"; srcGeoLiteCity = fetchDB "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz" - "11jpl54s1r98adlsr2f88zj4x9pg7gwxphd7hhq8jp3hwrgrwhs8"; + "07hx9g6kif75icsblcdk64rq13w2knpns4lrxdbf63mmqbqxj29g"; srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz" - "1fhi5vm4drfzyl29b491pr1xr2kbsr3izp9a7k5zm3zkqags2187"; + "0f3y1cpjfd4q55a2kvhzsklmmp6k19v9vsdsjxr4sapc8f5fgfc9"; srcGeoIPASNum = fetchDB "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz" - "10jdh5dknk5y1kawgp5ijg6c74a7nrmmhhw75q9x82l151irdfky"; + "0jmvq6pllxj802yq1ygf487yk8qb30v7izrl82pyvqnjljkhkm5m"; srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz" - "10yrkilf0mx6i61zg2r2sd0dn2lwvq8k97jfwv8ysvq98lxb51a1"; + "0hcw69mfgqfhlrf4mwfb6qa1m107k2xrxjgr3fssk3l18x0bw2br"; meta = with stdenv.lib; { inherit version; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix deleted file mode 100644 index 36d2cc48c9f0..000000000000 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "docbook-xsl-ns-1.78.1"; - - src = fetchurl { - url = "mirror://sourceforge/docbook/${name}.tar.bz2"; - sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; - }; - - buildPhase = "true"; - - installPhase = - '' - dst=$out/share/xml/docbook-xsl-ns - mkdir -p $dst - rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp - mv * $dst/ - - # Backwards compatibility. Will remove eventually. - mkdir -p $out/xml/xsl - ln -s $dst $out/xml/xsl/docbook - ''; - - meta = { - homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; - description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh deleted file mode 100644 index 9ac8e74d93a3..000000000000 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -cd $out -unpackFile $src -mkdir xml -mkdir xml/xsl -mv docbook-xsl-* xml/xsl/docbook diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 981aa59369de..863f60444025 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,10 +1,47 @@ -{stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "docbook-xsl-1.78.1"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://sourceforge/docbook/docbook-xsl-1.78.1.tar.bz2; +let + + common = { pname, sha256 }: stdenv.mkDerivation rec { + name = "${pname}-1.78.1"; + + src = fetchurl { + url = "mirror://sourceforge/docbook/${name}.tar.bz2"; + inherit sha256; + }; + + buildPhase = "true"; + + installPhase = + '' + dst=$out/share/xml/${pname} + mkdir -p $dst + rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp + mv * $dst/ + + # Backwards compatibility. Will remove eventually. + mkdir -p $out/xml/xsl + ln -s $dst $out/xml/xsl/docbook + ''; + + meta = { + homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; + description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; + }; + }; + +in { + + docbook_xsl = common { + pname = "docbook-xsl"; sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9"; }; + + docbook_xsl_ns = common { + pname = "docbook-xsl-ns"; + sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; + }; + } diff --git a/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch b/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch new file mode 100644 index 000000000000..9e3e83b1262a --- /dev/null +++ b/pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch @@ -0,0 +1,67 @@ +Index: vte-0.26.0/src/vte.c +=================================================================== +--- vte-0.26.0.orig/src/vte.c 2010-11-30 23:04:53.000000000 -0800 ++++ vte-0.26.0/src/vte.c 2010-12-07 20:05:07.865548000 -0800 +@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina + long wcount, start, delta; + gboolean leftovers, modified, bottom, again; + gboolean invalidated_text; ++ gboolean in_scroll_region; + GArray *unichars; + struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL; + +@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina + cursor = screen->cursor_current; + cursor_visible = terminal->pvt->cursor_visible; + ++ in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ + /* We should only be called when there's data to process. */ + g_assert(terminal->pvt->incoming || + (terminal->pvt->pending->len > 0)); +@@ -3979,6 +3984,8 @@ skip_chunk: + * points to the first character which isn't part of this + * sequence. */ + if ((match != NULL) && (match[0] != '\0')) { ++ gboolean new_in_scroll_region; ++ + /* Call the right sequence handler for the requested + * behavior. */ + _vte_terminal_handle_sequence(terminal, +@@ -3989,12 +3996,20 @@ skip_chunk: + start = (next - wbuf); + modified = TRUE; + +- /* if we have moved during the sequence handler, restart the bbox */ ++ new_in_scroll_region = screen->scrolling_restricted ++ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start)) ++ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end)); ++ ++ delta = screen->scroll_delta; /* delta may have changed from sequence. */ ++ ++ /* if we have moved greatly during the sequence handler, or moved into a scroll_region ++ * from outside it, restart the bbox */ + if (invalidated_text && +- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || +- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) { ++ ((new_in_scroll_region && !in_scroll_region) || ++ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK || ++ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) { + /* Clip off any part of the box which isn't already on-screen. */ + bbox_topleft.x = MAX(bbox_topleft.x, 0); + bbox_topleft.y = MAX(bbox_topleft.y, delta); +@@ -4014,6 +4029,8 @@ skip_chunk: + bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT; + bbox_topleft.x = bbox_topleft.y = G_MAXINT; + } ++ ++ in_scroll_region = new_in_scroll_region; + } else + /* Second, we have a NULL match, and next points to the very + * next character in the buffer. Insert the character which diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 5932caf9e97d..b086c64abff8 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./alt.patch + ./change-scroll-region.patch # CVE-2012-2738 ./vte-0.28.2-limit-arguments.patch ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix index 2126aa9ee4db..81a64e9e1757 100644 --- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite ] + gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] ++ stdenv.lib.optional valaSupport vala; propagatedBuildInputs = [ libsecret nss nspr libical db ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix index a4a26bca1922..abd5074685ac 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix @@ -3,11 +3,11 @@ , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: stdenv.mkDerivation rec { - name = "gcr-3.14.0"; + name = "gcr-${gnome3.version}.0"; src = fetchurl { - url = "mirror://gnome/sources/gcr/3.14/${name}.tar.xz"; - sha256 = "2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d"; + url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz"; + sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc"; }; buildInputs = [ @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { #doCheck = true; + enableParallelBuilding = true; + preFixup = '' wrapProgram "$out/bin/gcr-viewer" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix index d4ef3e13eea9..d3d6f4e471c4 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X" ''; - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" + configureFlags = [ "--sysconfdir=/etc" + "--localstatedir=/var" + "--with-systemd=yes" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; buildInputs = [ pkgconfig glib itstool libxml2 intltool @@ -30,7 +32,10 @@ stdenv.mkDerivation rec { ''; # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + patches = [ ./xserver_path.patch ./sessions_dir.patch + ./disable_x_access_control.patch ./no-dbus-launch.patch ]; + + installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GDM; diff --git a/pkgs/development/compilers/ghc/7.10.1.nix b/pkgs/development/compilers/ghc/7.10.1.nix deleted file mode 100644 index 34c2e3b36b0c..000000000000 --- a/pkgs/development/compilers/ghc/7.10.1.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }: - -let - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib" - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - - # We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454 - # This should be removed when GHC includes Cabal > 1.22.2.0 - cabalPatch = fetchpatch { - url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch; - sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb"; - }; - -in - -stdenv.mkDerivation rec { - version = "7.10.1"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/7.10.1/${name}-src.tar.xz"; - sha256 = "181srnj3s5dcqb096yminjg50lq9cx57075n95y5hz33gbbf7wwj"; - }; - - buildInputs = [ ghc perl ]; - - enableParallelBuilding = true; - - patches = [ - # Fix user pkg db location for GHCJS: - # https://ghc.haskell.org/trac/ghc/ticket/10232 - (fetchpatch { - url = "https://git.haskell.org/ghc.git/patch/c46e4b184e0abc158ad8f1eff6b3f0421acaf984"; - sha256 = "0fkdyqd4bqp742rydwmqq8d2n7gf61bgdhaiw8xf7jy0ix7lr60w"; - }) - # Fix TH + indirect symbol resolution on OSX (or any system using gold linker) - # https://phabricator.haskell.org/D852 - ./osx-dylib-resolver.patch - ]; - - postPatch = '' - pushd libraries/Cabal - patch -p1 < ${cabalPatch} - popd - ''; - - preConfigure = '' - echo >mk/build.mk "${buildMK}" - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix index 064610c3557b..73fcd788c74f 100644 --- a/pkgs/development/compilers/ghc/7.10.2.nix +++ b/pkgs/development/compilers/ghc/7.10.2.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils }: +{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils +, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour +}: let @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { sha256 = "1x8m4rp2v7ydnrz6z9g8x7z3x3d3pxhv2pixy7i7hkbqbdsp7kal"; }; - buildInputs = [ ghc perl ]; + buildInputs = [ ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour ]; enableParallelBuilding = true; @@ -47,6 +49,9 @@ stdenv.mkDerivation rec { stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc + # Patch scripts to include "readelf" and "cat" in $PATH. for i in "$out/bin/"*; do test ! -h $i || continue diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 65d52c1a3e51..fe0d0b37371e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150809"; + version = "7.11.20150828"; name = "ghc-${version}"; - rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977"; + rev = "38c98e4f61a48084995a5347d76ddd024ce1a09c"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l"; + sha256 = "0wnxrfzjpjcmsmd2i0zg30jg7zpw1rrfwz8r56g314l7xcns6yp1"; }; postUnpack = '' diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix index 3f0b9e866b05..6334759496f0 100644 --- a/pkgs/development/compilers/ghc/nokinds.nix +++ b/pkgs/development/compilers/ghc/nokinds.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150718"; + version = "7.11.20150826"; name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details. - rev = "4cb79c85a4976c509a65a8638899391a60cd0962"; + rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179"; src = fetchgit { url = "https://github.com/goldfirere/ghc.git"; inherit rev; - sha256 = "1pyz459hs189bw2jaz7k2j2r53nc1vfa4q3zd3zz1zm0h14lsmlv"; + sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn"; }; postUnpack = '' diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix index 8abafe0d117c..4f9e8b25b755 100644 --- a/pkgs/development/compilers/go/1.5.nix +++ b/pkgs/development/compilers/go/1.5.nix @@ -105,8 +105,14 @@ stdenv.mkDerivation rec { ./all.bash ''; + preFixup = '' + rm -r $out/share/go/pkg/bootstrap + ''; + setupHook = ./setup-hook.sh; + disallowedReferences = [ go_1_4 ]; + meta = with stdenv.lib; { branch = "1.5"; homepage = http://golang.org/; diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index a55861175882..817b20af9c49 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { --replace /bin/bash ${stdenv.shell} substituteInPlace ./configure \ --replace "/usr/bin/env bash" ${stdenv.shell} + sed '1i#include <vector>' \ + -i ./third-party/mcrouter/mcrouter/lib/fibers/TimeoutController.h ''; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix index 1a496f457afd..7f0f263283d8 100644 --- a/pkgs/development/compilers/julia/0.3.nix +++ b/pkgs/development/compilers/julia/0.3.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchurl # build tools -, gfortran, git, m4, patchelf, perl, which +, gfortran, git, m4, patchelf, perl, which, python2 # libjulia dependencies , libunwind, llvm, readline, utf8proc, zlib # standard library dependencies @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "julia"; - version = "0.3.10"; + version = "0.3.11"; name = "${pname}-${version}"; src = fetchgit { url = "git://github.com/JuliaLang/julia.git"; rev = "refs/tags/v${version}"; - sha256 = "0px1zd7qmz6rrjf58k4kq55s7h8mny1w6xvcsrny2wbgckxzhqsg"; + sha256 = "06xmv2l8hskdh1s5y2dh28vpb5pc0gzmfl5a03yp0qjjsl5cb284"; name = "julia-git-v${version}"; }; @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { name = "dsfmt-${dsfmt_ver}.tar.gz"; md5 = "cb61be3be7254eae39684612c524740d"; }; - in [ dsfmt_src ]; + + in [ dsfmt_src llvm.src ]; prePatch = '' copy_kill_hash(){ @@ -59,25 +60,15 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libunwind llvm readline utf8proc zlib + [ libunwind readline utf8proc zlib double_conversion fftw fftwSinglePrec glpk gmp mpfr pcre openblas arpack suitesparse ]; - nativeBuildInputs = [ gfortran git m4 patchelf perl which ]; + nativeBuildInputs = [ gfortran git m4 patchelf perl which python2 ]; makeFlags = - let - arch = head (splitString "-" stdenv.system); - march = - { "x86_64-linux" = "x86-64"; - "x86_64-darwin" = "x86-64"; - "i686-linux" = "i686"; - }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - in [ - "ARCH=${arch}" - "MARCH=${march}" - "JULIA_CPU_TARGET=${march}" + [ "PREFIX=$(out)" "prefix=$(out)" "SHELL=${stdenv.shell}" @@ -96,7 +87,6 @@ stdenv.mkDerivation rec { "USE_SYSTEM_GMP=1" "USE_SYSTEM_GRISU=1" "USE_SYSTEM_LIBUNWIND=1" - "USE_SYSTEM_LLVM=1" "USE_SYSTEM_MPFR=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" @@ -142,6 +132,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - broken = false; }; } diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index 3082a53137b8..306e287fbc26 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -6,10 +6,10 @@ let in stdenv.mkDerivation rec { name = "mono-${version}"; - version = "4.0.2.5"; + version = "4.0.3.20"; src = fetchurl { url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2"; - sha256 = "0lfndz7l3j593wilyczb5w6kvrdbf2fsd1i46qlszfjvx975hx5h"; + sha256 = "1z0k8gv5z3yrkjhi2yjaqj42p55jn5h3q4z890gkcrlvmgihnv4p"; }; buildInputs = diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix index 6bb60c6dc69e..ee7d0c7749d9 100644 --- a/pkgs/development/compilers/rustc/generic.nix +++ b/pkgs/development/compilers/rustc/generic.nix @@ -118,15 +118,13 @@ stdenv.mkDerivation { configureFlags = configureFlags ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ] + # TODO always include starting from 1.3.0, superseeding patch and substituteInPlace below + ++ stdenv.lib.optional (!isRelease) [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${stdenv.cc.binutils}/bin/ar" ] ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang"; inherit patches; postPatch = '' - substituteInPlace src/librustc_back/target/mod.rs \ - --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \ - --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" - substituteInPlace src/rust-installer/gen-install-script.sh \ --replace /bin/echo "${coreutils}/bin/echo" substituteInPlace src/rust-installer/gen-installer.sh \ @@ -135,7 +133,11 @@ stdenv.mkDerivation { # Workaround for NixOS/nixpkgs#8676 substituteInPlace mk/rustllvm.mk \ --replace "\$\$(subst /,//," "\$\$(subst /,/," - ''; + '' + stdenv.lib.optionalString (isRelease) '' + substituteInPlace src/librustc_back/target/mod.rs \ + --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \ + --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" + ''; # TODO remove in 1.3.0, superseeded by configure flags buildInputs = [ which file perl curl python27 makeWrapper git ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ procps valgrind ]; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index d65258a3a08d..3b1cccee9413 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,18 +1,18 @@ +# Please make sure to check if rustfmt still builds when updating nightly + { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-08-09"; + shortVersion = "2015-09-05"; isRelease = false; - # src rev for 2015-08-09's nightly channel - srcRev = "a5d33d891"; - srcSha = "1iivzk9ggjh7y89rbw275apw4rfmzh4jk50kf0milljhvf72660n"; - snapshotHashLinux686 = "3459275cdf3896f678e225843fa56f0d9fdbabe8"; - snapshotHashLinux64 = "e451e3bd6e5fcef71e41ae6f3da9fb1cf0e13a0c"; - snapshotHashDarwin686 = "428944a7984c0988e77909d82ca2ef77d96a1fbd"; - snapshotHashDarwin64 = "b0515bb7d2892b9a58282fc865fee11a885406d6"; - snapshotDate = "2015-07-26"; - snapshotRev = "a5c12f4"; - patches = [ - ./patches/head.patch - ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; + # src rev for 2015-09-05's nightly channel + srcRev = "779b2a9847319106647dcad12fc6dc472bc0cf4d"; + srcSha = "0m22lxpcjnwa68bpxhfvp07k52gyds8ykif2pf5r2x22lw28vbg3"; + snapshotHashLinux686 = "e2553bf399cd134a08ef3511a0a6ab0d7a667216"; + snapshotHashLinux64 = "7df8ba9dec63ec77b857066109d4b6250f3d222f"; + snapshotHashDarwin686 = "29750870c82a0347f8b8b735a4e2e0da26f5098d"; + snapshotHashDarwin64 = "c9f2c588238b4c6998190c3abeb33fd6164099a2"; + snapshotDate = "2015-08-11"; + snapshotRev = "1af31d4"; + patches = stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch; } diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch index ace22c825f9e..2425fff04a15 100644 --- a/pkgs/development/compilers/rustc/patches/head.patch +++ b/pkgs/development/compilers/rustc/patches/head.patch @@ -1,18 +1,3 @@ -diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs -index 39e4291..b352bd1 100644 ---- a/src/librustc_back/target/mod.rs -+++ b/src/librustc_back/target/mod.rs -@@ -179,8 +179,8 @@ impl Default for TargetOptions { - fn default() -> TargetOptions { - TargetOptions { - data_layout: String::new(), -- linker: "cc".to_string(), -- ar: "ar".to_string(), -+ linker: "@ccPath@".to_string(), // ignore-tidy-linelength -+ ar: "@arPath@".to_string(), // ignore-tidy-linelength - pre_link_args: Vec::new(), - post_link_args: Vec::new(), - cpu: "generic".to_string(), diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs index 2772fc8..3d37b08 100644 --- a/src/test/run-pass/issue-20797.rs diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index bc1f9a9043d7..861a12f1f09f 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20150520"; + version = "20150819"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "06pl6z4sh5fvh72drz4bp70yynr4i1rawc97ww5wag8976dirwrm"; + sha256 = "0gpdlq3aazx121k3ia94qfa4dyv04q7478x2p6hvcjamn18vk56n"; }; buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ]; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index f0d3be6487c0..4412b3d535c8 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, lib }: +{ go, govers, parallel, lib }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -41,7 +41,7 @@ go.stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { name = "go${go.meta.branch}-${name}"; - nativeBuildInputs = [ go ] + nativeBuildInputs = [ go parallel ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = [ go ] ++ buildInputs; @@ -62,7 +62,7 @@ go.stdenv.mkDerivation ( rmdir extraSrc '') + '' - GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH runHook postConfigure ''; @@ -80,38 +80,39 @@ go.stdenv.mkDerivation ( runHook renameImports - PIDS=() - if [ -n "$subPackages" ] ; then - for p in $subPackages ; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p & - PIDS+=("$!") - done - else - pushd go/src - while read d; do - { - echo "$d" | grep -q "/_" && continue - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue - local OUT - if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then - if ! echo "$OUT" | grep -q 'no buildable Go source files'; then - echo "$OUT" >&2 - exit 1 - fi - fi - if [ -n "$OUT" ]; then - echo "$OUT" >&2 - fi - } & - PIDS+=("$!") - done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq) - popd - fi - - # Exit on error from the parallel process - for PID in "''${PIDS[@]}"; do - wait $PID || exit 1 - done + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then + if ! echo "$OUT" | grep -q 'no buildable Go source files'; then + echo "$OUT" >&2 + return 1 + fi + fi + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + return 0 + } + + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + else + pushd go/src >/dev/null + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | sort | uniq + popd >/dev/null + fi + } + + export -f buildGoDir # parallel needs to see the function + getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install runHook postBuild ''; @@ -119,25 +120,7 @@ go.stdenv.mkDerivation ( checkPhase = args.checkPhase or '' runHook preCheck - PIDS=() - if [ -n "$subPackages" ] ; then - for p in $subPackages ; do - go test -p $NIX_BUILD_CORES -v $goPackagePath/$p & - PIDS+=("$!") - done - else - pushd go/src - while read d; do - go test -p $NIX_BUILD_CORES -v $d & - PIDS+=("$!") - done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq) - popd - fi - - # Exit on error from the parallel process - for PID in "''${PIDS[@]}"; do - wait $PID || exit 1 - done + getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test runHook postCheck ''; @@ -146,19 +129,17 @@ go.stdenv.mkDerivation ( runHook preInstall mkdir -p $out - - if [ -z "$dontInstallSrc" ]; then - pushd "$NIX_BUILD_TOP/go" - while read f; do - echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue - mkdir -p "$(dirname "$out/share/go/$f")" - cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f" - done < <(find . -type f) - popd - fi - + pushd "$NIX_BUILD_TOP/go" + while read f; do + echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue + mkdir -p "$(dirname "$out/share/go/$f")" + cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f" + done < <(find . -type f) + popd + + mkdir -p $bin dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $out + [ -e "$dir" ] && cp -r $dir $bin runHook postInstall ''; @@ -168,7 +149,7 @@ go.stdenv.mkDerivation ( cat $file ${removeExpr removeReferences} > $file.tmp mv $file.tmp $file chmod +x $file - done < <(find $out/bin -type f 2>/dev/null) + done < <(find $bin/bin -type f 2>/dev/null) ''; disallowedReferences = lib.optional (!allowGoReference) go @@ -178,6 +159,9 @@ go.stdenv.mkDerivation ( enableParallelBuilding = enableParallelBuilding; + # I prefer to call this dev but propagatedBuildInputs expects $out to exist + outputs = [ "out" "bin" ]; + meta = { # Add default meta information platforms = lib.platforms.all; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41eeaf30cc55..7b93293a5ebc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -89,6 +89,12 @@ self: super: { yices-easy = dontDistribute super.yices-easy; yices-painless = dontDistribute super.yices-painless; + # https://github.com/GaloisInc/RSA/issues/9 + RSA = dontCheck super.RSA; + + # https://github.com/froozen/kademlia/issues/2 + kademlia = dontCheck super.kademlia; + # Won't find it's header files without help. sfml-audio = appendConfigureFlag super.sfml-audio "--extra-include-dirs=${pkgs.openal}/include/AL"; @@ -289,21 +295,22 @@ self: super: { hakyll = dontCheck super.hakyll; Hclip = dontCheck super.Hclip; HList = dontCheck super.HList; + ide-backend = dontCheck super.ide-backend; marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69 memcached-binary = dontCheck super.memcached-binary; + msgpack-rpc = dontCheck super.msgpack-rpc; persistent-zookeeper = dontCheck super.persistent-zookeeper; pocket-dns = dontCheck super.pocket-dns; postgresql-simple = dontCheck super.postgresql-simple; postgrest = dontCheck super.postgrest; snowball = dontCheck super.snowball; + sophia = dontCheck super.sophia; test-sandbox = dontCheck super.test-sandbox; users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1 xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; - ide-backend = dontCheck super.ide-backend; - msgpack-rpc = dontCheck super.msgpack-rpc; # These packages try to access the network. amqp = dontCheck super.amqp; @@ -430,6 +437,7 @@ self: super: { language-slice = dontCheck super.language-slice; lensref = dontCheck super.lensref; liquidhaskell = dontCheck super.liquidhaskell; + lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 lvmrun = dontCheck super.lvmrun; memcache = dontCheck super.memcache; milena = dontCheck super.milena; @@ -465,6 +473,7 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; + tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; @@ -573,9 +582,6 @@ self: super: { # This packages compiles 4+ hours on a fast machine. That's just unreasonable. CHXHtml = dontDistribute super.CHXHtml; - # https://github.com/bos/bloomfilter/issues/7 - bloomfilter = overrideCabal super.bloomfilter (drv: { broken = !pkgs.stdenv.is64bit; }); - # https://github.com/NixOS/nixpkgs/issues/6350 paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; }); @@ -591,9 +597,9 @@ self: super: { # https://github.com/vincenthz/hs-asn1/issues/12 asn1-encoding = dontCheck super.asn1-encoding; - # wxc supports wxGTX >= 2.9, but our current default version points to 2.8. - wxc = super.wxc.override { wxGTK = pkgs.wxGTK29; }; - wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; }; + # wxc supports wxGTX >= 3.0, but our current default version points to 2.8. + wxc = super.wxc.override { wxGTK = pkgs.wxGTK30; }; + wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # Depends on QuickCheck 1.x. HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; }; @@ -749,7 +755,10 @@ self: super: { zlib = dontCheck super.zlib; # Override the obsolete version from Hackage with our more up-to-date copy. - cabal2nix = self.callPackage ../tools/haskell/cabal2nix {}; + cabal2nix = self.callPackage ../tools/haskell/cabal2nix/cabal2nix.nix {}; + hackage2nix = self.callPackage ../tools/haskell/cabal2nix/hackage2nix.nix {}; + language-nix = self.callPackage ../tools/haskell/cabal2nix/language-nix.nix {}; + distribution-nixpkgs = self.callPackage ../tools/haskell/cabal2nix/distribution-nixpkgs.nix {}; # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7 HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding; @@ -763,23 +772,6 @@ self: super: { # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; - # https://github.com/goldfirere/singletons/issues/117 - clash-lib = dontDistribute super.clash-lib; - clash-verilog = dontDistribute super.clash-verilog; - Frames = dontDistribute super.Frames; - hgeometry = dontDistribute super.hgeometry; - hipe = dontDistribute super.hipe; - hsqml-datamodel-vinyl = dontDistribute super.hsqml-datamodel-vinyl; - singleton-nats = dontDistribute super.singleton-nats; - singletons = markBroken super.singletons; - units-attoparsec = dontDistribute super.units-attoparsec; - ihaskell-widgets = dontDistribute super.ihaskell-widgets; - exinst-bytes = dontDistribute super.exinst-bytes; - exinst-deepseq = dontDistribute super.exinst-deepseq; - exinst-aeson = dontDistribute super.exinst-aeson; - exinst = dontDistribute super.exinst; - exinst-hashable = dontDistribute super.exinst-hashable; - # https://github.com/anton-k/temporal-music-notation/issues/1 temporal-music-notation = markBroken super.temporal-music-notation; temporal-music-notation-demo = dontDistribute super.temporal-music-notation-demo; @@ -817,9 +809,6 @@ self: super: { # FPCO's fork of Cabal won't succeed its test suite. Cabal-ide-backend = dontCheck super.Cabal-ide-backend; - # https://github.com/ekmett/comonad/issues/25 - comonad = dontCheck super.comonad; - # https://github.com/jaspervdj/websockets/issues/104 websockets = dontCheck super.websockets; @@ -1010,4 +999,20 @@ self: super: { ]; prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" ''; }); + + # https://github.com/basvandijk/concurrent-extra/issues/12 + concurrent-extra = dontCheck super.concurrent-extra; + + # https://github.com/bos/bloomfilter/issues/7 + bloomfilter = appendPatch super.bloomfilter ./patches/bloomfilter-fix-on-32bit.patch; + + # https://github.com/pxqr/base32-bytestring/issues/4 + base32-bytestring = dontCheck super.base32-bytestring; + + # https://github.com/JohnLato/listlike/pull/6#issuecomment-137986095 + ListLike = dontCheck super.ListLike; + + # https://github.com/goldfirere/singletons/issues/122 + singletons = dontCheck super.singletons; + } 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 04205825ef2f..28092f8d886f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -225,10 +225,6 @@ self: super: { timerep = dontCheck super.timerep; # Upstream has no issue tracker. - harp = markBrokenVersion "0.4" super.harp; - happstack-authenticate = dontDistribute super.happstack-authenticate; - - # Upstream has no issue tracker. llvm-base-types = markBroken super.llvm-base-types; llvm-analysis = dontDistribute super.llvm-analysis; llvm-data-interop = dontDistribute super.llvm-data-interop; @@ -256,8 +252,8 @@ self: super: { HLearn-distributions = dontDistribute super.HLearn-distributions; HLearn-classification = dontDistribute super.HLearn-classification; - # Won't work with LLVM 3.5. - llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + # Doesn't work with LLVM 3.5. + llvm-general = markBroken super.llvm-general; # Inexplicable haddock failure # https://github.com/gregwebs/aeson-applicative/issues/2 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml new file mode 100644 index 000000000000..88a6212a465e --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -0,0 +1,3994 @@ +# pkgs/development/haskell-modules/configuration-hackage2nix.yaml + +compiler: ghc-7.10 + +core-packages: + - array-0.5.1.0 + - base-4.8.1.0 + - binary-0.7.5.0 + - bin-package-db-0.0.0.0 + - bytestring-0.10.6.0 + - Cabal-1.22.4.0 + - containers-0.5.6.2 + - deepseq-1.4.1.1 + - directory-1.2.2.0 + - filepath-1.4.0.0 + - ghc-7.10.2 + - ghc-prim-0.4.0.0 + - haskeline-0.7.2.1 + - hoopl-3.10.0.2 + - hpc-0.6.0.2 + - integer-gmp-1.0.0.0 + - pretty-1.1.2.0 + - process-1.2.3.0 + - rts-1.0 + - template-haskell-2.10.0.0 + - terminfo-0.4.0.1 + - time-1.5.0.1 + - transformers-0.4.2.0 + - unix-2.7.1.0 + - xhtml-3000.2.1 + +default-package-overrides: + - cabal-helper < 0.6.0.0 # newer versions break ghc-mod + +extra-packages: + - aeson < 0.8 # newer versions don't work with GHC 6.12.3 + - Cabal == 1.18.* # required for cabal-install et al on old GHC versions + - Cabal == 1.20.* # required for cabal-install et al on old GHC versions + - cabal-install == 1.18.* # required for ghc-mod on 7.8.x + - conduit < 1.2.4.2 # newer versions trigger non-deterministic ID bugs in GHC versions prior to 7.10.x + - 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 + - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x + - haddock-api < 2.16 # required on GHC 7.8.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 + - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 + - QuickCheck < 2 # required by test-framework-quickcheck and its users + - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - split < 0.2 # newer versions don't work with GHC 6.12.3 + - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x + - vector < 0.10.10 # newer versions don't work with GHC 6.12.3 + - zlib < 0.6 # newer versions break cabal-install + +package-maintainers: + simons: + - cabal2nix + - cabal-install + - funcmp + - git-annex + - hackage-db + - hledger-interest + - hopenssl + - hsdns + - hsemail + - hsyslog + - jailbreak-cabal + - language-nix + - stack + - streamproc + gebner: + - hledger-diff + gridaphobe: + - ghc-srcspan-plugin + - liquid-fixpoint + - liquidhaskell + - located-base + - target + jb55: + - cased + - pipes-csv + - pipes-mongodb + psibi: + - path-pieces + - persistent + - persistent-mongoDB + - persistent-mysql + - persistent-postgresql + - persistent-redis + - persistent-sqlite + - persistent-template + - persistent-zookeeper + - shakespeare + +dont-distribute-packages: + 3d-graphics-examples: [ x86_64-darwin ] + 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] + 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] + abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + abc-puzzle: [ x86_64-darwin ] + abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + abt: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] + accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] + access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-EasyRaster-GTK: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-HalfInteger: [ i686-linux, x86_64-linux, x86_64-darwin ] + acid-state-dist: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-hq9plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + ACME: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-inator: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-numbersystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-schoenfinkel: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-zero: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] + ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] + activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] + actor: [ i686-linux, x86_64-linux, x86_64-darwin ] + AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] + Adaptive-Blaisorblade: [ i686-linux, x86_64-linux, x86_64-darwin ] + adaptive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + Adaptive: [ i686-linux, x86_64-linux, x86_64-darwin ] + adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] + adblock2privoxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] + adict: [ i686-linux, x86_64-linux, x86_64-darwin ] + adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + ADPfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + adp-multi: [ i686-linux, x86_64-linux, x86_64-darwin ] + adp-multi-monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] + Advgame: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-Basics: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-Net: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-Real-Double: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-Real: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-Real-Interval: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-RnToRm: [ i686-linux, x86_64-linux, x86_64-darwin ] + AERN-RnToRm-Plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] + AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] + afv: [ i686-linux, x86_64-linux, x86_64-darwin ] + Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] + agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] + AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] + airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] + aivika-experiment-diagrams: [ x86_64-darwin ] + aivika-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] + alea: [ i686-linux, x86_64-linux, x86_64-darwin ] + algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] + AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] + alms: [ i686-linux, x86_64-linux, x86_64-darwin ] + alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] + alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-core: [ x86_64-darwin ] + alsa-gui: [ x86_64-darwin ] + alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-mixer: [ x86_64-darwin ] + alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-pcm: [ x86_64-darwin ] + alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-seq: [ x86_64-darwin ] + altfloat: [ i686-linux, x86_64-linux, x86_64-darwin ] + alure: [ i686-linux, x86_64-linux, x86_64-darwin ] + ALUT: [ x86_64-darwin ] + al: [ x86_64-darwin ] + amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ec2: [ i686-linux ] + amazonka-rds: [ i686-linux ] + amazonka-s3: [ i686-linux ] + amazonka-sqs: [ i686-linux ] + amazonka-swf: [ i686-linux ] + amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] + AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] + ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] + anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] + android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] + AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ] + angel: [ i686-linux, x86_64-linux, x86_64-darwin ] + Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] + antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] + anticiv: [ i686-linux, x86_64-linux, x86_64-darwin ] + antigate: [ i686-linux, x86_64-linux, x86_64-darwin ] + antimirov: [ i686-linux, x86_64-linux, x86_64-darwin ] + antlrc: [ i686-linux, x86_64-linux, x86_64-darwin ] + anydbm: [ i686-linux, x86_64-linux, x86_64-darwin ] + aosd: [ i686-linux, x86_64-linux, x86_64-darwin ] + apelsin: [ i686-linux, x86_64-linux, x86_64-darwin ] + apiary-helics: [ i686-linux, x86_64-linux, x86_64-darwin ] + apiary-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + apis: [ i686-linux, x86_64-linux, x86_64-darwin ] + api-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + apotiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + appc: [ i686-linux, x86_64-linux, x86_64-darwin ] + app-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + ApplePush: [ i686-linux, x86_64-linux, x86_64-darwin ] + AppleScript: [ i686-linux, x86_64-linux, x86_64-darwin ] + approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] + arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] + archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] + archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] + archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + arff: [ i686-linux, x86_64-linux, x86_64-darwin ] + argparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + arguedit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ariadne: [ i686-linux, x86_64-linux, x86_64-darwin ] + arion: [ i686-linux, x86_64-linux, x86_64-darwin ] + arithmetic: [ i686-linux ] + armada: [ i686-linux, x86_64-linux, x86_64-darwin ] + array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] + ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ] + arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + arrow-improve: [ i686-linux, x86_64-linux, x86_64-darwin ] + arrowp: [ i686-linux, x86_64-linux, x86_64-darwin ] + ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] + arx: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + asic: [ i686-linux, x86_64-linux, x86_64-darwin ] + asil: [ i686-linux, x86_64-linux, x86_64-darwin ] + asn1-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] + assimp: [ i686-linux, x86_64-linux, x86_64-darwin ] + astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] + astview: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] + atom-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] + atomic-primops-foreign: [ x86_64-darwin ] + atomic-primops-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + atom-msp430: [ i686-linux, x86_64-linux, x86_64-darwin ] + atomo: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] + atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] + augeas: [ i686-linux, x86_64-linux, x86_64-darwin ] + augur: [ i686-linux, x86_64-linux, x86_64-darwin ] + Aurochs: [ i686-linux, x86_64-linux, x86_64-darwin ] + authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] + AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] + autoproc: [ i686-linux, x86_64-linux, x86_64-darwin ] + avahi: [ i686-linux, x86_64-linux, x86_64-darwin ] + avers: [ i686-linux, x86_64-linux, x86_64-darwin ] + AvlTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + awesomium: [ i686-linux, x86_64-linux, x86_64-darwin ] + awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] + AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-general: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-kinesis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-kinesis: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-kinesis-reshard: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-performance-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-sdk-text-converter: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-sdk-xml-unordered: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-sns: [ i686-linux, x86_64-linux, x86_64-darwin ] + azure-service-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] + babylon: [ x86_64-darwin ] + backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] + Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] + bag: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo-launcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo-plugin-highlight: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo-plugin-photo: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo-theme-blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamboo-theme-mini-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamse: [ i686-linux, x86_64-linux, x86_64-darwin ] + bamstats: [ x86_64-darwin ] + barley: [ i686-linux, x86_64-linux, x86_64-darwin ] + Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] + barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] + barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + base32-bytestring: [ x86_64-darwin ] + baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] + bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] + BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] + beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] + beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ] + bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ] + Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] + bein: [ i686-linux, x86_64-linux, x86_64-darwin ] + BenchmarkHistory: [ i686-linux ] + berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] + BerkeleyDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] + berp: [ i686-linux, x86_64-linux, x86_64-darwin ] + bff: [ i686-linux, x86_64-linux, x86_64-darwin ] + bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] + bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] + bidispec: [ i686-linux, x86_64-linux, x86_64-darwin ] + BigPixel: [ x86_64-darwin ] + billboard-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + billeksah-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] + billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] + billeksah-pane: [ i686-linux, x86_64-linux, x86_64-darwin ] + billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-indexed-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-strict: [ i686-linux, x86_64-linux, x86_64-darwin ] + binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-cctools: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-codec2: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-dc1394: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-directfb: [ x86_64-darwin ] + bindings-eskit: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-fann: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-friso: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-hamlib: [ x86_64-darwin ] + bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-levmar: [ x86_64-darwin ] + bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-libv4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-linux-videodev2: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-lxc: [ x86_64-darwin ] + bindings-mpdecimal: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-parport: [ x86_64-darwin ] + bindings-sane: [ x86_64-darwin ] + bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] + binding-wx: [ x86_64-darwin ] + bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] + binembed-example: [ x86_64-darwin ] + BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseDotP: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseFasta: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] + bio: [ i686-linux, x86_64-linux, x86_64-darwin ] + biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] + biosff: [ i686-linux, x86_64-linux, x86_64-darwin ] + biostockholm: [ i686-linux, x86_64-linux, x86_64-darwin ] + bird: [ i686-linux, x86_64-linux, x86_64-darwin ] + BirdPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + bit-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitcoin-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitly-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + Bitly: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitmap-opengl: [ x86_64-darwin ] + bits-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitset: [ i686-linux, x86_64-linux, x86_64-darwin ] + bits-extras: [ x86_64-darwin ] + bitspeak: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + BitSyntax: [ i686-linux, x86_64-linux, x86_64-darwin ] + bittorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + bitvec: [ i686-linux, x86_64-linux, x86_64-darwin ] + bit-vector: [ i686-linux ] + bkr: [ i686-linux, x86_64-linux, x86_64-darwin ] + black-jewel: [ i686-linux, x86_64-linux, x86_64-darwin ] + blacktip: [ i686-linux ] + bla: [ i686-linux, x86_64-linux, x86_64-darwin ] + blakesum-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + blakesum: [ i686-linux, x86_64-linux, x86_64-darwin ] + blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + blas-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + blas: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] + blazeMarker: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-textual-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] + blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] + BlogLiterately-diagrams: [ x86_64-darwin ] + bloxorz: [ x86_64-darwin ] + blubber: [ x86_64-darwin ] + Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] + board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] + bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] + boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] + bools: [ i686-linux, x86_64-linux, x86_64-darwin ] + boolsimplifier: [ i686-linux, x86_64-linux, x86_64-darwin ] + boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] + borel: [ i686-linux, x86_64-linux, x86_64-darwin ] + bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + brainfuck-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] + breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] + brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] + brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] + broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + bsd-sysctl: [ i686-linux, x86_64-linux, x86_64-darwin ] + bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] + bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] + btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + buffer-builder-aeson: [ i686-linux ] + buffer-builder: [ i686-linux ] + buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] + buster-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + buster: [ i686-linux, x86_64-linux, x86_64-darwin ] + Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] + buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] + bustle: [ x86_64-darwin ] + bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-plain: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-short: [ i686-linux, x86_64-linux, x86_64-darwin ] + c2hs: [ x86_64-darwin ] + cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalrpmdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] + cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] + cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] + cal3d-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] + cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + calc: [ i686-linux, x86_64-linux, x86_64-darwin ] + caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] + caledon: [ i686-linux, x86_64-linux, x86_64-darwin ] + call-haskell-from-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] + campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] + cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] + cao: [ i686-linux, x86_64-linux, x86_64-darwin ] + Capabilities: [ i686-linux, x86_64-linux, x86_64-darwin ] + cap: [ i686-linux, x86_64-linux, x86_64-darwin ] + capri: [ i686-linux, x86_64-linux, x86_64-darwin ] + carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] + carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings-ipopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] + casadi-bindings-snopt-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] + Cascade: [ i686-linux, x86_64-linux, x86_64-darwin ] + cascading: [ i686-linux, x86_64-linux, x86_64-darwin ] + cash: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassava-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] + casui: [ i686-linux, x86_64-linux, x86_64-darwin ] + Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] + catch-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont-cxe: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont-exc: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + CC-delcont-ref-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + cci: [ i686-linux, x86_64-linux, x86_64-darwin ] + cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] + ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + cellrenderer-cairo: [ x86_64-darwin ] + cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + certificate: [ i686-linux, x86_64-linux, x86_64-darwin ] + cf: [ i686-linux, x86_64-linux, x86_64-darwin ] + cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] + cflp: [ i686-linux, x86_64-linux, x86_64-darwin ] + cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] + cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] + cg: [ i686-linux ] + cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] + chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] + charade: [ i686-linux, x86_64-linux, x86_64-darwin ] + charsetdetect-ae: [ x86_64-darwin ] + Chart-diagrams: [ x86_64-darwin ] + chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] + checked: [ i686-linux, x86_64-linux, x86_64-darwin ] + check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] + chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] + chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chitra: [ i686-linux, x86_64-linux, x86_64-darwin ] + chp: [ i686-linux, x86_64-linux, x86_64-darwin ] + chp-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + chp-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + chp-spec: [ i686-linux, x86_64-linux, x86_64-darwin ] + chp-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ] + chunks: [ i686-linux, x86_64-linux, x86_64-darwin ] + church-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + cil: [ i686-linux, x86_64-linux, x86_64-darwin ] + cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] + c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + cio: [ i686-linux, x86_64-linux, x86_64-darwin ] + citation-resolve: [ i686-linux, x86_64-linux, x86_64-darwin ] + citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] + cityhash: [ x86_64-darwin ] + cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] + clac: [ i686-linux, x86_64-linux, x86_64-darwin ] + clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] + claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] + claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] + ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] + ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-page: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + cld2: [ x86_64-darwin ] + Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] + clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] + clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] + clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] + clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] + clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + clua: [ i686-linux, x86_64-linux, x86_64-darwin ] + cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] + clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] + clustertools: [ i686-linux, x86_64-linux, x86_64-darwin ] + clutterhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmaes: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmath: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmathml3: [ i686-linux, x86_64-linux, x86_64-darwin ] + CMCompare: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmdargs-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + cnc-spec-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] + cndict: [ i686-linux, x86_64-linux, x86_64-darwin ] + Coadjute: [ i686-linux, x86_64-linux, x86_64-darwin ] + Codec-Image-DevIL: [ i686-linux, x86_64-linux, x86_64-darwin ] + codec-libevent: [ i686-linux, x86_64-linux, x86_64-darwin ] + codecov-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + codemonitor: [ i686-linux, x86_64-linux, x86_64-darwin ] + codepad: [ i686-linux, x86_64-linux, x86_64-darwin ] + cognimeta-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + colada: [ i686-linux, x86_64-linux, x86_64-darwin ] + collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] + collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + collections: [ i686-linux, x86_64-linux, x86_64-darwin ] + coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinat: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinatorial-problems: [ i686-linux, x86_64-linux, x86_64-darwin ] + combinator-interactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + com: [ i686-linux, x86_64-linux, x86_64-darwin ] + Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] + commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] + commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] + comonad-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + comonad-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] + compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] + complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] + compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + compression: [ i686-linux, x86_64-linux, x86_64-darwin ] + compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] + comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] + computational-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + concraft-hr: [ i686-linux, x86_64-linux, x86_64-darwin ] + concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] + concraft-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] + concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] + concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] + condorcet: [ i686-linux, x86_64-linux, x86_64-darwin ] + condor: [ i686-linux, x86_64-linux, x86_64-darwin ] + Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] + conductive-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] + conductive-hsc3: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-audio-lame: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-audio-samplerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-audio-sndfile: [ x86_64-darwin ] + conduit-iconv: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] + Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] + config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] + conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] + const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] + consumers: [ x86_64-darwin ] + containers-benchmark: [ i686-linux ] + context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] + continue: [ i686-linux, x86_64-linux, x86_64-darwin ] + continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] + Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-monad-attempt: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-monad-exception-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-monad-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-monad-failure-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + Control-Monad-MultiPass: [ i686-linux, x86_64-linux, x86_64-darwin ] + Control-Monad-ST2: [ i686-linux, x86_64-linux, x86_64-darwin ] + contstuff-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + contstuff-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + convertible-ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] + convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-c99: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-language: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] + copilot-sbv: [ i686-linux, x86_64-linux, x86_64-darwin ] + COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] + corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] + CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] + CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] + core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + core: [ i686-linux, x86_64-linux, x86_64-darwin ] + Coroutine: [ i686-linux, x86_64-linux, x86_64-darwin ] + coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + couchdb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + couch-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + court: [ i686-linux, x86_64-linux, x86_64-darwin ] + coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] + CPBrainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] + cpio-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + CPL: [ i686-linux, x86_64-linux, x86_64-darwin ] + cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] + cpython: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + crack: [ i686-linux, x86_64-linux, x86_64-darwin ] + Craft3e: [ i686-linux, x86_64-linux, x86_64-darwin ] + craftwerk-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + craftwerk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] + crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] + crf-chain1-constrained: [ i686-linux, x86_64-linux, x86_64-darwin ] + crf-chain1: [ i686-linux, x86_64-linux, x86_64-darwin ] + crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + crf-chain2-tiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + cr: [ i686-linux, x86_64-linux, x86_64-darwin ] + criterion: [ i686-linux ] + criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + crocodile: [ i686-linux, x86_64-linux, x86_64-darwin ] + cron: [ i686-linux, x86_64-linux, x86_64-darwin ] + crunghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] + cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] + cse-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression-opcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-expression-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + csound-sampler: [ i686-linux, x86_64-linux, x86_64-darwin ] + csp: [ i686-linux, x86_64-linux, x86_64-darwin ] + cspmchecker: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] + css: [ i686-linux, x86_64-linux, x86_64-darwin ] + ctemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + ctkl: [ i686-linux, x86_64-linux, x86_64-darwin ] + ctpl: [ i686-linux, x86_64-linux, x86_64-darwin ] + cubicspline: [ x86_64-darwin ] + cuboid: [ x86_64-darwin ] + cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] + curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] + cursedcsv: [ i686-linux, x86_64-linux, x86_64-darwin ] + curves: [ i686-linux, x86_64-linux, x86_64-darwin ] + cv-combinators: [ x86_64-darwin ] + CV: [ i686-linux, x86_64-linux, x86_64-darwin ] + cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] + daemons: [ i686-linux ] + dag: [ i686-linux, x86_64-linux, x86_64-darwin ] + DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] + dao: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dao: [ i686-linux, x86_64-linux, x86_64-darwin ] + dapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-beta: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcsden: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-fastconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-monitor: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcs-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] + darcswatch: [ i686-linux, x86_64-linux, x86_64-darwin ] + darkplaces-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] + datadog: [ i686-linux ] + data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-named: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-object-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-quotientref: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] + DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] + dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-llvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-salt: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-simpl: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-core-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-source-tetra: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + Deadpan-DDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ] + DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + decoder-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + dedukti: [ i686-linux, x86_64-linux, x86_64-darwin ] + deeplearning-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + deepseq-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] + deepseq-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + deepzoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + defargs: [ i686-linux, x86_64-linux, x86_64-darwin ] + DefendTheKing: [ i686-linux, x86_64-linux, x86_64-darwin ] + definitive-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + definitive-filesystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + definitive-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + definitive-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + definitive-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + definitive-sound: [ i686-linux, x86_64-linux, x86_64-darwin ] + dejafu: [ i686-linux, x86_64-linux, x86_64-darwin ] + deka: [ i686-linux, x86_64-linux, x86_64-darwin ] + deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] + delta-h: [ i686-linux, x86_64-linux, x86_64-darwin ] + demarcate: [ i686-linux, x86_64-linux, x86_64-darwin ] + denominate: [ i686-linux, x86_64-linux, x86_64-darwin ] + depends: [ i686-linux, x86_64-linux, x86_64-darwin ] + dephd: [ i686-linux, x86_64-linux, x86_64-darwin ] + dequeue: [ i686-linux, x86_64-linux, x86_64-darwin ] + derangement: [ i686-linux, x86_64-linux, x86_64-darwin ] + derivation-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] + derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + devil: [ x86_64-darwin ] + dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] + dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] + dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-builder: [ x86_64-darwin ] + diagrams-cairo: [ x86_64-darwin ] + diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-gtk: [ x86_64-darwin ] + diagrams-haddock: [ x86_64-darwin ] + diagrams-hsqml: [ x86_64-darwin ] + diagrams-html5: [ x86_64-darwin ] + diagrams-lib: [ x86_64-darwin ] + diagrams-pandoc: [ x86_64-darwin ] + diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-postscript: [ x86_64-darwin ] + diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-rasterific: [ x86_64-darwin ] + diagrams-rubiks-cube: [ x86_64-darwin ] + diagrams-svg: [ x86_64-darwin ] + diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] + dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + dice: [ i686-linux ] + dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] + dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] + DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] + dingo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dingo-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + dingo-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] + diophantine: [ i686-linux, x86_64-linux, x86_64-darwin ] + diplomacy-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + direct-binary-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] + direct-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + direct-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin ] + dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] + discount: [ i686-linux, x86_64-linux, x86_64-darwin ] + disjoint-set: [ i686-linux, x86_64-linux, x86_64-darwin ] + DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] + distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + dist-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] + diversity: [ i686-linux ] + djinn-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] + dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] + dnssd: [ i686-linux, x86_64-linux, x86_64-darwin ] + doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] + dockercook: [ i686-linux, x86_64-linux, x86_64-darwin ] + docker: [ i686-linux, x86_64-linux, x86_64-darwin ] + doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] + doctest-discover-configurator: [ i686-linux, x86_64-linux, x86_64-darwin ] + doctest-discover: [ i686-linux, x86_64-linux, x86_64-darwin ] + DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] + DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] + dominion: [ i686-linux ] + dotfs: [ x86_64-darwin ] + download: [ i686-linux, x86_64-linux, x86_64-darwin ] + download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] + dow: [ x86_64-darwin ] + dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-lifted-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-lifted-copy: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-lifted-vseg: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-par: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-prim-par: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-prim-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] + dph-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] + DP: [ i686-linux, x86_64-linux, x86_64-darwin ] + DPM: [ i686-linux, x86_64-linux, x86_64-darwin ] + drClickOn: [ i686-linux, x86_64-linux, x86_64-darwin ] + DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] + DrIFT-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] + drifter-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] + dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] + dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] + ds-kanren: [ i686-linux, x86_64-linux, x86_64-darwin ] + dsmc: [ i686-linux, x86_64-linux, x86_64-darwin ] + dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] + dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtd: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + duplo: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dust-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dust: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dust-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + Dust-tools-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] + dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] + dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] + dx9base: [ i686-linux, x86_64-linux, x86_64-darwin ] + dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin ] + dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamic-graph: [ x86_64-darwin ] + dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] + DynamicTimeWarp: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynobud: [ i686-linux, x86_64-linux, x86_64-darwin ] + DysFRP-Cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + DysFRP-Craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] + easy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] + easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] + easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] + ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] + edenmodules: [ i686-linux, x86_64-linux, x86_64-darwin ] + edenskel: [ i686-linux, x86_64-linux, x86_64-darwin ] + edentv: [ i686-linux, x86_64-linux, x86_64-darwin ] + edge: [ i686-linux, x86_64-linux, x86_64-darwin ] + EdisonCore: [ i686-linux, x86_64-linux, x86_64-darwin ] + edit-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] + editline: [ i686-linux, x86_64-linux, x86_64-darwin ] + EditTimeReport: [ i686-linux, x86_64-linux, x86_64-darwin ] + EEConfig: [ i686-linux, x86_64-linux, x86_64-darwin ] + effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] + effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] + effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] + ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] + eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + eithers: [ i686-linux, x86_64-linux, x86_64-darwin ] + EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-rrd: [ i686-linux ] + electrum-mnemonic: [ i686-linux ] + elerea-examples: [ x86_64-darwin ] + emacs-keys: [ x86_64-darwin ] + email-header: [ i686-linux, x86_64-linux, x86_64-darwin ] + email: [ i686-linux, x86_64-linux, x86_64-darwin ] + email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + embeddock-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + embeddock: [ i686-linux, x86_64-linux, x86_64-darwin ] + embroidery: [ i686-linux, x86_64-linux, x86_64-darwin ] + emgm: [ i686-linux, x86_64-linux, x86_64-darwin ] + Emping: [ i686-linux, x86_64-linux, x86_64-darwin ] + empty: [ i686-linux, x86_64-linux, x86_64-darwin ] + Encode: [ i686-linux, x86_64-linux, x86_64-darwin ] + enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ] + EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + epanet-haskell: [ x86_64-darwin ] + epic: [ x86_64-darwin ] + epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] + epub-metadata: [ x86_64-darwin ] + epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] + epub-tools: [ x86_64-darwin ] + Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] + equational-reasoning: [ i686-linux, x86_64-linux, x86_64-darwin ] + erlang: [ i686-linux, x86_64-linux, x86_64-darwin ] + eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] + ersatz: [ i686-linux, x86_64-linux, x86_64-darwin ] + ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] + esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] + estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] + estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] + Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + Etage: [ i686-linux, x86_64-linux, x86_64-darwin ] + EtaMOO: [ i686-linux, x86_64-linux, x86_64-darwin ] + Eternal10Seconds: [ i686-linux, x86_64-linux, x86_64-darwin ] + eternal: [ i686-linux, x86_64-linux, x86_64-darwin ] + Etherbunny: [ i686-linux, x86_64-linux, x86_64-darwin ] + ethereum-client-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + ethereum-merkle-patricia-db: [ i686-linux, x86_64-linux, x86_64-darwin ] + euphoria: [ i686-linux, x86_64-linux, x86_64-darwin ] + eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ] + Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ] + event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] + event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventstore: [ i686-linux ] + every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] + ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] + exif: [ i686-linux, x86_64-linux, x86_64-darwin ] + exists: [ i686-linux, x86_64-linux, x86_64-darwin ] + expand: [ i686-linux, x86_64-linux, x86_64-darwin ] + expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + explain: [ i686-linux, x86_64-linux, x86_64-darwin ] + explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] + explore: [ i686-linux, x86_64-linux, x86_64-darwin ] + exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + exp-pairs: [ i686-linux, x86_64-linux, x86_64-darwin ] + extcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + extemp: [ i686-linux, x86_64-linux, x86_64-darwin ] + extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] + external-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] + ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] + faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] + factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] + fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] + falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] + fastbayes: [ x86_64-darwin ] + fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + fast-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] + fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] + FComp: [ i686-linux, x86_64-linux, x86_64-darwin ] + fdo-trash: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed2lj: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] + feldspar-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] + feldspar-language: [ i686-linux, x86_64-linux, x86_64-darwin ] + fences: [ i686-linux, x86_64-linux, x86_64-darwin ] + fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ] + FermatsLastMargin: [ i686-linux, x86_64-linux, x86_64-darwin ] + FerryCore: [ i686-linux, x86_64-linux, x86_64-darwin ] + ffeed: [ i686-linux, x86_64-linux, x86_64-darwin ] + ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] + fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] + fields: [ i686-linux, x86_64-linux, x86_64-darwin ] + FieldTrip: [ i686-linux, x86_64-linux, x86_64-darwin ] + fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ] + filecache: [ x86_64-darwin ] + FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] + filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] + Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] + find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] + FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] + fit: [ i686-linux, x86_64-linux, x86_64-darwin ] + fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-point: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-point-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + fixplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] + flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + flickr: [ i686-linux, x86_64-linux, x86_64-darwin ] + Flippi: [ i686-linux, x86_64-linux, x86_64-darwin ] + flite: [ i686-linux, x86_64-linux, x86_64-darwin ] + floating-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] + flo: [ i686-linux, x86_64-linux, x86_64-darwin ] + flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + flower: [ i686-linux, x86_64-linux, x86_64-darwin ] + flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] + flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] + FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] + fold-debounce-conduit: [ x86_64-darwin ] + fold-debounce: [ x86_64-darwin ] + foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-transduce: [ i686-linux, x86_64-linux, x86_64-darwin ] + folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + folds: [ i686-linux, x86_64-linux, x86_64-darwin ] + follower: [ i686-linux, x86_64-linux, x86_64-darwin ] + Folly: [ i686-linux, x86_64-linux, x86_64-darwin ] + foma: [ i686-linux, x86_64-linux, x86_64-darwin ] + font-opengl-basic4x6: [ i686-linux, x86_64-linux, x86_64-darwin ] + foo: [ i686-linux, x86_64-linux, x86_64-darwin ] + forbidden-fruit: [ i686-linux, x86_64-linux, x86_64-darwin ] + fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] + for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] + FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] + formal: [ i686-linux, x86_64-linux, x86_64-darwin ] + format: [ i686-linux, x86_64-linux, x86_64-darwin ] + format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] + formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + formlets: [ i686-linux, x86_64-linux, x86_64-darwin ] + forml: [ i686-linux, x86_64-linux, x86_64-darwin ] + ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] + forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] + fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + FPretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + frag: [ i686-linux, x86_64-linux, x86_64-darwin ] + franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] + Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] + freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freenect: [ x86_64-darwin ] + free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] + freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] + freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-seq-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] + FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] + frpnow-gloss: [ x86_64-darwin ] + fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] + fsnotify: [ x86_64-darwin ] + fswatcher: [ x86_64-darwin ] + ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] + FTGL-bytestring: [ x86_64-darwin ] + FTGL: [ x86_64-darwin ] + ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ftshell: [ i686-linux, x86_64-linux, x86_64-darwin ] + full-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + fullstop: [ i686-linux, x86_64-linux, x86_64-darwin ] + full-text-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] + functor-apply: [ i686-linux, x86_64-linux, x86_64-darwin ] + functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] + FunGEn: [ x86_64-darwin ] + funion: [ i686-linux, x86_64-linux, x86_64-darwin ] + funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] + future: [ i686-linux, x86_64-linux, x86_64-darwin ] + fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] + gact: [ i686-linux, x86_64-linux, x86_64-darwin ] + gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] + game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] + gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] + gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] + geek: [ i686-linux, x86_64-linux, x86_64-darwin ] + geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + gemstone: [ i686-linux, x86_64-linux, x86_64-darwin ] + gencheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + gender: [ i686-linux, x86_64-linux, x86_64-darwin ] + genders: [ i686-linux, x86_64-linux, x86_64-darwin ] + general-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + generators: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] + genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] + genetics: [ i686-linux, x86_64-linux, x86_64-darwin ] + geniconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] + geni-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] + GenI: [ i686-linux, x86_64-linux, x86_64-darwin ] + geniserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + geni-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] + GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] + geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] + geoip2: [ i686-linux ] + GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] + geom2d: [ i686-linux ] + GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] + getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] + getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] + ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcid: [ x86_64-darwin ] + ghci-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghci-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghcjs-dom-hello: [ x86_64-darwin ] + ghcjs-dom: [ x86_64-darwin ] + ghclive: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-parmake: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + GHood: [ i686-linux, x86_64-linux, x86_64-darwin ] + ght: [ i686-linux, x86_64-linux, x86_64-darwin ] + ginsu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gist: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-webhook-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] + glade: [ i686-linux, x86_64-linux, x86_64-darwin ] + gladexml-accessor: [ i686-linux, x86_64-linux, x86_64-darwin ] + glapp: [ x86_64-darwin ] + gl-capture: [ x86_64-darwin ] + GLFW-b-demo: [ x86_64-darwin ] + GLFW-OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + GLFW-task: [ x86_64-darwin ] + GLFW: [ x86_64-darwin ] + GLHUI: [ x86_64-darwin ] + glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] + global: [ i686-linux, x86_64-linux, x86_64-darwin ] + glome-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + GlomeTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] + GlomeView: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-algorithms: [ x86_64-darwin ] + gloss-banana: [ x86_64-darwin ] + gloss-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] + gloss-examples: [ x86_64-darwin ] + gloss-game: [ x86_64-darwin ] + gloss-juicy: [ x86_64-darwin ] + gloss-raster: [ x86_64-darwin ] + gloss-rendering: [ x86_64-darwin ] + gloss-sodium: [ x86_64-darwin ] + gloss: [ x86_64-darwin ] + GLURaw: [ x86_64-darwin ] + GLUtil: [ x86_64-darwin ] + gluturtle: [ x86_64-darwin ] + GLUT: [ x86_64-darwin ] + gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] + gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] + gnome-keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] + gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] + gnuidn: [ x86_64-darwin ] + goa: [ i686-linux, x86_64-linux, x86_64-darwin ] + goatee-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + goatee: [ i686-linux, x86_64-linux, x86_64-darwin ] + gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-mail-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] + googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] + GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] + gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] + gps: [ i686-linux, x86_64-linux, x86_64-darwin ] + gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] + GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] + grapefruit-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + grapefruit-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] + grapefruit-records: [ i686-linux, x86_64-linux, x86_64-darwin ] + grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + grapefruit-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + GraphHammer: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphics-drawingcombinators: [ x86_64-darwin ] + graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] + greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + Grempa: [ i686-linux, x86_64-linux, x86_64-darwin ] + gridland: [ x86_64-darwin ] + grm: [ i686-linux, x86_64-linux, x86_64-darwin ] + Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] + GrowlNotify: [ i686-linux, x86_64-linux, x86_64-darwin ] + gruff-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + gruff: [ i686-linux, x86_64-linux, x86_64-darwin ] + gsl-random-fu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gsl-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + gsmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gstreamer: [ i686-linux, x86_64-linux, x86_64-darwin ] + GTALib: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-cast-glade: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-cast-gnomevfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-cast-gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-cast-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-hello: [ x86_64-darwin ] + gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk3: [ x86_64-darwin ] + gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] + GtkGLTV: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtkimageview: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-largeTreeStore: [ x86_64-darwin ] + gtk-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtkrsync: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk-serialized-event: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtksourceview3: [ x86_64-darwin ] + gtk-toy: [ i686-linux, x86_64-linux, x86_64-darwin ] + guess-combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] + GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] + haar: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hach: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-happstack-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack2-interface-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage2twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-frontend-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-evhttp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-kibro: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-simpleserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-middleware-cleanpath: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-middleware-clientsession: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-middleware-jsonp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackport: [ i686-linux, x86_64-linux, x86_64-darwin ] + hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + haddocset: [ i686-linux, x86_64-linux, x86_64-darwin ] + haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] + Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] + hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-agda: [ x86_64-darwin ] + hakyll-blaze-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-contrib-hyphenation: [ x86_64-darwin ] + hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-sass: [ x86_64-darwin ] + hakyll: [ x86_64-darwin ] + halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaLeX: [ i686-linux, x86_64-linux, x86_64-darwin ] + halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] + halive: [ x86_64-darwin ] + halma: [ x86_64-darwin ] + hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] + handle-like: [ i686-linux, x86_64-linux, x86_64-darwin ] + happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] + happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] + happraise: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppS-Data: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppSHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + happs-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + happs-hsp-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppS-IxSet: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppS-Server: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppS-State: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-authenticate: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-dlg: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] + happs-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] + HAppS-Util: [ i686-linux, x86_64-linux, x86_64-darwin ] + happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] + happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hark: [ i686-linux, x86_64-linux, x86_64-darwin ] + HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] + HarmTrace-Base: [ i686-linux, x86_64-linux, x86_64-darwin ] + HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascal: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascat-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascat-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hascat-system: [ i686-linux, x86_64-linux, x86_64-darwin ] + Haschoo: [ i686-linux, x86_64-linux, x86_64-darwin ] + HasGP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashable-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] + hash: [ i686-linux, x86_64-linux, x86_64-darwin ] + has: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskakafka: [ x86_64-darwin ] + haskanoid: [ x86_64-darwin ] + haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell2010: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell98: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-catchio-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-catchio-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-catchio-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-connect-hdbc-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hdbc-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-odbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-hsql-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelldb-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-in-space: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellLM: [ x86_64-darwin ] + haskell-mpi: [ x86_64-darwin ] + haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] + Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-src-meta-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-token-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskelm: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] + hask: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-script: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoin-wallet: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoon-httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoon: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskoon-salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskore: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskore-realtime: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskore-supercollider: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskore-synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskore-vintage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasloGUI: [ i686-linux, x86_64-linux, x86_64-darwin ] + haslo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hasparql-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + hastache-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] + has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] + haverer: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ] + hawitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hawk: [ i686-linux, x86_64-linux, x86_64-darwin ] + haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + hayland: [ i686-linux, x86_64-linux, x86_64-darwin ] + hayoo-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hayoo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hback: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hBDD-CMUBDD: [ i686-linux, x86_64-linux, x86_64-darwin ] + hBDD-CUDD: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbeat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hblas: [ i686-linux, x86_64-linux, x86_64-darwin ] + hblock: [ i686-linux, x86_64-linux, x86_64-darwin ] + h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] + hbro: [ x86_64-darwin ] + hburg: [ i686-linux, x86_64-linux, x86_64-darwin ] + HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ] + HCL: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcron: [ i686-linux, x86_64-linux, x86_64-darwin ] + hCsound: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcube: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcwiid: [ x86_64-darwin ] + hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] + HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbi-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbi-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + hDFA: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdigest: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdis86: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdiscount: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdph-closure: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdph: [ i686-linux, x86_64-linux, x86_64-darwin ] + HDRUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] + hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedn: [ i686-linux, x86_64-linux, x86_64-darwin ] + heist-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + helics: [ i686-linux, x86_64-linux, x86_64-darwin ] + helics-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + helium: [ i686-linux, x86_64-linux, x86_64-darwin ] + hellage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hell: [ i686-linux, x86_64-linux, x86_64-darwin ] + hellnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + helm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hemkay: [ i686-linux, x86_64-linux, x86_64-darwin ] + hemokit: [ x86_64-darwin ] + henet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hen: [ i686-linux, x86_64-linux, x86_64-darwin ] + hepevt: [ i686-linux, x86_64-linux, x86_64-darwin ] + HERA: [ i686-linux, x86_64-linux, x86_64-darwin ] + herbalizer: [ i686-linux, x86_64-linux, x86_64-darwin ] + her-lexer: [ i686-linux, x86_64-linux, x86_64-darwin ] + her-lexer-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] + hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] + hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] + herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + hesql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hetris: [ i686-linux, x86_64-linux, x86_64-darwin ] + heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] + hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] + hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] + hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfann: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfd: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfoil: [ x86_64-darwin ] + hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] + HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfsevents: [ i686-linux, x86_64-linux, x86_64-darwin ] + HFuse: [ x86_64-darwin ] + hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgalib: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-API: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-Audio: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-CAudio-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-CEGUI-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-Enet-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-Graphics3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-GUI: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-InputSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-Network: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-Ogre-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-OIS-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-SDL2-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-SFML-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-WinEvent: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ] + hg-buildpackage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgen: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] + h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] + HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] + H: [ i686-linux, x86_64-linux, x86_64-darwin ] + hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hidapi: [ x86_64-darwin ] + hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] + hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] + HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] + higher-leveldb: [ x86_64-darwin ] + higherorder: [ i686-linux, x86_64-linux, x86_64-darwin ] + highjson: [ i686-linux ] + highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] + himg: [ i686-linux, x86_64-linux, x86_64-darwin ] + himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinduce-classifier-decisiontree: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinduce-classifier: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinduce-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinotify: [ x86_64-darwin ] + hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] + hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] + hissmetrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + historian: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] + HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlatex: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] + HLearn-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + HLearn-datastructures: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-irr: [ i686-linux ] + hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlibBladeRF: [ x86_64-darwin ] + hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] + HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + hly: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-banded: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-csv: [ x86_64-darwin ] + hmatrix-glpk: [ x86_64-darwin ] + hmatrix-gsl-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-gsl: [ x86_64-darwin ] + hmatrix-mmap: [ x86_64-darwin ] + hmatrix-nipals: [ x86_64-darwin ] + hmatrix-quadprogpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-repa: [ x86_64-darwin ] + hmatrix-special: [ x86_64-darwin ] + hmatrix-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-svdlibc: [ x86_64-darwin ] + hmatrix-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmatrix: [ x86_64-darwin ] + hmeap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmeap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmenu: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmm-hmatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] + HMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hMollom: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmp3: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hmpf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] + hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ] + hnetcdf: [ x86_64-darwin ] + HNM: [ i686-linux, x86_64-linux, x86_64-darwin ] + hnn: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ] + hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ] + hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ] + hob: [ i686-linux, x86_64-linux, x86_64-darwin ] + HODE: [ i686-linux, x86_64-linux, x86_64-darwin ] + hofix-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hogg: [ i686-linux, x86_64-linux, x86_64-darwin ] + hog: [ i686-linux, x86_64-linux, x86_64-darwin ] + hogre-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hogre: [ i686-linux, x86_64-linux, x86_64-darwin ] + hois: [ i686-linux, x86_64-linux, x86_64-darwin ] + hole: [ i686-linux, x86_64-linux, x86_64-darwin ] + holey-format: [ i686-linux, x86_64-linux, x86_64-darwin ] + Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] + Holumbus-MapReduce: [ i686-linux, x86_64-linux, x86_64-darwin ] + Holumbus-Searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] + Holumbus-Storage: [ i686-linux, x86_64-linux, x86_64-darwin ] + homeomorphic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] + hommage: [ i686-linux, x86_64-linux, x86_64-darwin ] + HongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + honi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodie: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-publish: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-render: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoodle-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + hood-off: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] + HOpenCV: [ x86_64-darwin ] + hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] + hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] + hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hp2any-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + hp2any-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + hp2any-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpage: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpaste: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpasteit: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpc-coveralls: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] + hPDB-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] + hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpodder: [ i686-linux, x86_64-linux, x86_64-darwin ] + HPong: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpqtypes: [ x86_64-darwin ] + hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpuz: [ x86_64-darwin ] + hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] + hquantlib: [ i686-linux, x86_64-darwin ] + hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] + HRay: [ i686-linux, x86_64-linux, x86_64-darwin ] + hR: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hricket: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT-graf: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT-hist: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + hruby: [ i686-linux ] + hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsbencher-fusion: [ i686-linux ] + hsc2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-auditor: [ x86_64-darwin ] + hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-lang: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-lisp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-rec: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsc3-sf-hsndfile: [ x86_64-darwin ] + hsc3-unsafe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] + hscurses-fish-ex: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsdev: [ x86_64-darwin ] + hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSFFIG: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-fltk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-gchart: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-GeoIP: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSGEP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsgnutls: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsgnutls-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsgsom: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsHaruPDF: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSHHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsHyperEstraier: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsignal: [ i686-linux, x86_64-linux, x86_64-darwin ] + hSimpleDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsJudy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslogger4j: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsndfile-storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsndfile-vector: [ x86_64-darwin ] + hsndfile: [ x86_64-darwin ] + hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsntp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSoundFile: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-expectations-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-demo-notes: [ x86_64-darwin ] + hsqml-demo-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsqml: [ x86_64-darwin ] + hsshellscript: [ x86_64-darwin ] + hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstatistics: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstorchat: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstradeking: [ i686-linux, x86_64-linux, x86_64-darwin ] + HStringTemplateHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hswip: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsXenCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsx-xhtml: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] + hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] + HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] + hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] + hTensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + html-entities: [ i686-linux, x86_64-linux, x86_64-darwin ] + htoml: [ i686-linux, x86_64-linux, x86_64-darwin ] + htsn-import: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-client-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-reverse-proxy: [ x86_64-darwin ] + https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] + HTTP-Simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + htune: [ i686-linux, x86_64-linux, x86_64-darwin ] + htzaar: [ x86_64-darwin ] + hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] + hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hums: [ i686-linux, x86_64-linux, x86_64-darwin ] + HUnit-Diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] + HUnit-Plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] + hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] + husk-scheme: [ i686-linux, x86_64-linux, x86_64-darwin ] + husk-scheme-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] + husky: [ i686-linux, x86_64-linux, x86_64-darwin ] + hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] + huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hws: [ i686-linux, x86_64-linux, x86_64-darwin ] + hXmixer: [ x86_64-darwin ] + hxmppc: [ i686-linux, x86_64-linux, x86_64-darwin ] + HXMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxournal: [ i686-linux, x86_64-linux, x86_64-darwin ] + HXQ: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxt-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] + hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hybrid: [ i686-linux, x86_64-linux, x86_64-darwin ] + hybrid-vectors: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydra-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydra-print: [ x86_64-darwin ] + hydrogen-cli-args: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen-prelude-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] + hylolib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperloglog: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] + i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + iban: [ i686-linux, x86_64-linux, x86_64-darwin ] + ideas: [ i686-linux, x86_64-linux, x86_64-darwin ] + ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] + idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] + IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + iException: [ i686-linux, x86_64-linux, x86_64-darwin ] + IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] + ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] + igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + ihaskell-inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] + ihaskell-plot: [ x86_64-darwin ] + ihaskell-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] + ihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] + illuminate: [ i686-linux, x86_64-linux, x86_64-darwin ] + imagemagick: [ i686-linux ] + imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] + imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] + imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] + imm: [ i686-linux, x86_64-linux, x86_64-darwin ] + imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + implicit: [ i686-linux, x86_64-linux, x86_64-darwin ] + improve: [ i686-linux, x86_64-linux, x86_64-darwin ] + INblobs: [ i686-linux, x86_64-linux, x86_64-darwin ] + inch: [ i686-linux, x86_64-linux, x86_64-darwin ] + include-file: [ i686-linux, x86_64-linux, x86_64-darwin ] + incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] + incremental-sat-solver: [ i686-linux, x86_64-linux, x86_64-darwin ] + increments: [ i686-linux, x86_64-linux, x86_64-darwin ] + index-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + indices: [ i686-linux, x86_64-linux, x86_64-darwin ] + indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] + infer-upstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + infinity: [ i686-linux, x86_64-linux, x86_64-darwin ] + InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] + infix: [ i686-linux, x86_64-linux, x86_64-darwin ] + inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] + informative: [ i686-linux, x86_64-linux, x86_64-darwin ] + inilist: [ i686-linux, x86_64-linux, x86_64-darwin ] + inline-r: [ i686-linux, x86_64-linux, x86_64-darwin ] + instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] + intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] + interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] + interleavableIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] + interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] + intricacy: [ i686-linux, x86_64-linux, x86_64-darwin ] + intset: [ i686-linux, x86_64-linux, x86_64-darwin ] + io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] + IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] + iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] + ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] + ipc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] + ircbouncer: [ i686-linux, x86_64-linux, x86_64-darwin ] + Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + ireal: [ i686-linux, x86_64-linux, x86_64-darwin ] + IrrHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] + isiz: [ x86_64-darwin ] + ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] + iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] + iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + iteratee-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + iteratee-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + iterIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + iterio-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivor: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-backend-c: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-bitdata: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-hw: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-opts: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivory-stdlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + ivy-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + ixdopp: [ i686-linux, x86_64-linux, x86_64-darwin ] + ixset-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + iyql: [ i686-linux, x86_64-linux, x86_64-darwin ] + j2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + jack-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] + JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] + jack: [ x86_64-darwin ] + jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] + jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] + jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] + java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + java-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + java-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] + javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] + Javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] + javav: [ i686-linux, x86_64-linux, x86_64-darwin ] + Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] + jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] + jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + join: [ i686-linux, x86_64-linux, x86_64-darwin ] + joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] + jort: [ i686-linux, x86_64-linux, x86_64-darwin ] + jose-jwt: [ i686-linux ] + jsaddle-hello: [ x86_64-darwin ] + jsaddle: [ x86_64-darwin ] + jsc: [ i686-linux, x86_64-linux, x86_64-darwin ] + JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] + js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] + json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + json2: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] + JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] + JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + jspath: [ i686-linux, x86_64-linux, x86_64-darwin ] + judy: [ i686-linux, x86_64-linux, x86_64-darwin ] + JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] + jukebox: [ x86_64-darwin ] + JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] + JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-client: [ x86_64-darwin ] + Kalman: [ x86_64-darwin ] + kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-comet: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] + kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] + katt: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-reactive-fs: [ i686-linux, x86_64-linux, x86_64-darwin ] + keera-hails-reactive-wx: [ x86_64-darwin ] + keera-posture: [ i686-linux, x86_64-linux, x86_64-darwin ] + keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] + keter: [ x86_64-darwin ] + kevin: [ i686-linux, x86_64-linux, x86_64-darwin ] + keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] + keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] + kibro: [ i686-linux, x86_64-linux, x86_64-darwin ] + kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + kickass-torrents-dump-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + KiCS-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] + KiCS: [ i686-linux, x86_64-linux, x86_64-darwin ] + KiCS-prophecy: [ i686-linux, x86_64-linux, x86_64-darwin ] + kif-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + kit: [ i686-linux, x86_64-linux, x86_64-darwin ] + kmeans-par: [ i686-linux, x86_64-linux, x86_64-darwin ] + kmeans-vector: [ i686-linux ] + koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] + korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] + kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + ks-test: [ i686-linux ] + ktx: [ x86_64-darwin ] + kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] + labeled-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + laborantin-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + labyrinth: [ i686-linux, x86_64-linux, x86_64-darwin ] + labyrinth-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + lagrangian: [ x86_64-darwin ] + laika: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-haskell-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-irc-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-misc-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-novelty-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-reference-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-social-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + LambdaCalculator: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-canvas: [ x86_64-darwin ] + lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] + LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] + LambdaNet: [ x86_64-darwin ] + LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] + LambdaShell: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] + lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-boogie: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-c-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-c-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-eiffel: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-go: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-lua2: [ i686-linux ] + language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-python-colour: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-qux: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-sh: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-spelling: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] + latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] + lat: [ i686-linux, x86_64-linux, x86_64-darwin ] + layers: [ i686-linux, x86_64-linux, x86_64-darwin ] + layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] + lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] + l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] + lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + lda: [ i686-linux ] + ldap-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] + leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] + leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] + learning-hmm: [ i686-linux, x86_64-darwin ] + learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] + leksah-server: [ x86_64-darwin ] + leksah: [ x86_64-darwin ] + leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + leveldb-haskell: [ x86_64-darwin ] + levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + levmar: [ x86_64-darwin ] + lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] + lha: [ i686-linux, x86_64-linux, x86_64-darwin ] + lhe: [ i686-linux, x86_64-linux, x86_64-darwin ] + LibClang: [ i686-linux, x86_64-linux, x86_64-darwin ] + libconfig: [ x86_64-darwin ] + libcspm: [ i686-linux, x86_64-linux, x86_64-darwin ] + libexpect: [ i686-linux, x86_64-linux, x86_64-darwin ] + libGenI: [ i686-linux, x86_64-linux, x86_64-darwin ] + libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] + libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] + libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] + liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] + libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] + libpq: [ i686-linux, x86_64-linux, x86_64-darwin ] + libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + libssh2: [ x86_64-darwin ] + libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + libsystemd-journal: [ x86_64-darwin ] + libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + libxslt: [ i686-linux, x86_64-linux, x86_64-darwin ] + life: [ x86_64-darwin ] + lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] + lighttpd-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] + lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + lilypond: [ i686-linux, x86_64-linux, x86_64-darwin ] + Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] + limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] + linda: [ x86_64-darwin ] + linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-circuit: [ x86_64-darwin ] + linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-opengl: [ x86_64-darwin ] + linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearscan: [ i686-linux, x86_64-linux, x86_64-darwin ] + LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] + LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] + linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] + linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-file-extents: [ x86_64-darwin ] + linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-mount: [ x86_64-darwin ] + linux-namespaces: [ x86_64-darwin ] + linux-perf: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-ptrace: [ i686-linux, x86_64-linux, x86_64-darwin ] + lio-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ] + lio-fs: [ x86_64-darwin ] + lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + literals: [ i686-linux, x86_64-linux, x86_64-darwin ] + live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] + ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] + llsd: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-ffi: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-general-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] + llvm-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] + lmdb: [ x86_64-darwin ] + local-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + loch: [ i686-linux, x86_64-linux, x86_64-darwin ] + log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] + log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + logging-facade-journald: [ x86_64-darwin ] + logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] + LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] + LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] + LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] + log: [ x86_64-darwin ] + lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] + lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] + lojbanXiragan: [ i686-linux, x86_64-linux, x86_64-darwin ] + lojysamban: [ i686-linux, x86_64-linux, x86_64-darwin ] + loli: [ i686-linux, x86_64-linux, x86_64-darwin ] + loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] + loopy: [ i686-linux, x86_64-linux, x86_64-darwin ] + lord: [ i686-linux, x86_64-linux, x86_64-darwin ] + loris: [ i686-linux, x86_64-linux, x86_64-darwin ] + lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] + lscabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + L-seed: [ i686-linux, x86_64-linux, x86_64-darwin ] + LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] + ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] + lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + ltk: [ x86_64-darwin ] + luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] + luautils: [ i686-linux, x86_64-linux, x86_64-darwin ] + lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] + Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] + lui: [ i686-linux, x86_64-linux, x86_64-darwin ] + luka: [ i686-linux, x86_64-linux, x86_64-darwin ] + luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] + lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] + lvmlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + lxc: [ x86_64-darwin ] + lye: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma: [ i686-linux ] + lzma-streams: [ i686-linux ] + maam: [ i686-linux, x86_64-linux, x86_64-darwin ] + mage: [ i686-linux, x86_64-linux, x86_64-darwin ] + MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] + magico: [ x86_64-darwin ] + magma: [ i686-linux, x86_64-linux, x86_64-darwin ] + mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] + majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] + majority: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-filemanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-imageviewer: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-mplayer: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-pdfviewer: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-processmanager: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] + manatee-welcome: [ i686-linux, x86_64-linux, x86_64-darwin ] + mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] + mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds: [ x86_64-darwin ] + marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] + markdown2svg: [ i686-linux, x86_64-linux, x86_64-darwin ] + markdown-kate: [ i686-linux, x86_64-linux, x86_64-darwin ] + markdown-pap: [ i686-linux, x86_64-linux, x86_64-darwin ] + markov-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] + markup-preview: [ i686-linux, x86_64-linux, x86_64-darwin ] + marmalade-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] + marquise: [ i686-linux, x86_64-linux, x86_64-darwin ] + marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] + masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] + mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] + math-functions: [ i686-linux ] + mathgenealogy: [ i686-linux, x86_64-linux, x86_64-darwin ] + mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] + matlab: [ i686-linux, x86_64-linux, x86_64-darwin ] + matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ] + maude: [ i686-linux, x86_64-linux, x86_64-darwin ] + maxent: [ i686-linux, x86_64-linux, x86_64-darwin ] + maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] + maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] + MaybeT-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] + mcmaster-gloss-examples: [ x86_64-darwin ] + mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ] + mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ] + Measure: [ i686-linux, x86_64-linux, x86_64-darwin ] + mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] + mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] + mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] + melody: [ i686-linux, x86_64-linux, x86_64-darwin ] + memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ] + metric: [ i686-linux, x86_64-linux, x86_64-darwin ] + Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + metronome: [ i686-linux, x86_64-linux, x86_64-darwin ] + MFlow: [ i686-linux, x86_64-linux, x86_64-darwin ] + mfsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] + MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] + microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + mida: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-alsa: [ x86_64-darwin ] + midimory: [ x86_64-darwin ] + midi-music-box: [ x86_64-darwin ] + midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] + mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] + mime-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] + mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + MiniAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] + miniball: [ i686-linux, x86_64-linux, x86_64-darwin ] + miniforth: [ i686-linux, x86_64-linux, x86_64-darwin ] + minimung: [ i686-linux, x86_64-linux, x86_64-darwin ] + minioperational: [ i686-linux, x86_64-linux, x86_64-darwin ] + miniplex: [ i686-linux, x86_64-linux, x86_64-darwin ] + minirotate: [ i686-linux, x86_64-linux, x86_64-darwin ] + minisat: [ x86_64-darwin ] + ministg: [ i686-linux, x86_64-linux, x86_64-darwin ] + mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] + misfortune: [ i686-linux ] + missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] + MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ] + mix-arrows: [ i686-linux, x86_64-linux, x86_64-darwin ] + mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] + mlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + moan: [ i686-linux, x86_64-linux, x86_64-darwin ] + modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] + modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] + modular-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + module-management: [ i686-linux, x86_64-linux, x86_64-darwin ] + Moe: [ x86_64-darwin ] + mohws: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-abort-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-bool: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-exception: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-levels: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-lrs: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadRandomLazy: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] + monarch: [ i686-linux, x86_64-linux, x86_64-darwin ] + Monaris: [ i686-linux, x86_64-linux, x86_64-darwin ] + Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] + Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] + mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] + monitor: [ x86_64-darwin ] + Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] + mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] + monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] + moo: [ i686-linux, x86_64-linux, x86_64-darwin ] + morfette: [ i686-linux, x86_64-linux, x86_64-darwin ] + morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] + mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + mount: [ i686-linux, x86_64-linux, x86_64-darwin ] + mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ] + mpppc: [ i686-linux, x86_64-linux, x86_64-darwin ] + mpretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + mprover: [ i686-linux, x86_64-linux, x86_64-darwin ] + mps: [ i686-linux, x86_64-linux, x86_64-darwin ] + mpvguihs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mqtt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + msgpack-idl: [ i686-linux, x86_64-linux, x86_64-darwin ] + mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] + mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + mtlx: [ i686-linux, x86_64-linux, x86_64-darwin ] + mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] + mudbath: [ i686-linux, x86_64-linux, x86_64-darwin ] + multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] + multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] + multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ] + multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] + multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + murder: [ i686-linux, x86_64-linux, x86_64-darwin ] + murmurhash3: [ i686-linux, x86_64-linux, x86_64-darwin ] + musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-score: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-sibelius: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] + music-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + mustache2hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + mutable-iter: [ i686-linux, x86_64-linux, x86_64-darwin ] + mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] + myo: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] + mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] + mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] + nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] + named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanoAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] + nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] + nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] + nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanomsg: [ x86_64-darwin ] + narc: [ i686-linux, x86_64-linux, x86_64-darwin ] + nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] + ncurses: [ x86_64-darwin ] + neat: [ i686-linux, x86_64-linux, x86_64-darwin ] + needle: [ i686-linux, x86_64-linux, x86_64-darwin ] + nehe-tuts: [ x86_64-darwin ] + nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] + nero: [ i686-linux, x86_64-linux, x86_64-darwin ] + nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] + netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] + netlink: [ x86_64-darwin ] + NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] + netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-anonymous-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-fancy: [ i686-linux ] + network-house: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-protocol-xmpp: [ x86_64-darwin ] + network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-simple-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-transport-zeromq: [ i686-linux ] + network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + newports: [ i686-linux, x86_64-linux, x86_64-darwin ] + newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] + newt: [ i686-linux, x86_64-linux, x86_64-darwin ] + newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] + nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] + nixos-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] + nme: [ i686-linux, x86_64-linux, x86_64-darwin ] + nm: [ i686-linux, x86_64-linux, x86_64-darwin ] + nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] + noise: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nomyx-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nomyx: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nomyx-Rules: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] + nondeterminism: [ i686-linux, x86_64-linux, x86_64-darwin ] + NonEmptyList: [ i686-linux, x86_64-linux, x86_64-darwin ] + noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] + NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss: [ x86_64-darwin ] + notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] + nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] + nthable: [ i686-linux, x86_64-linux, x86_64-darwin ] + null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] + numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] + numeric-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + nums: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] + NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] + nyan: [ x86_64-darwin ] + nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] + oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] + Object: [ i686-linux, x86_64-linux, x86_64-darwin ] + ObjectIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + objective: [ i686-linux, x86_64-linux, x86_64-darwin ] + obj: [ i686-linux, x86_64-linux, x86_64-darwin ] + octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] + oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + ofx: [ i686-linux, x86_64-linux, x86_64-darwin ] + OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + oi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] + omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] + omega: [ i686-linux, x86_64-linux, x86_64-darwin ] + Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] + omnicodec: [ i686-linux, x86_64-linux, x86_64-darwin ] + on-a-horse: [ i686-linux, x86_64-linux, x86_64-darwin ] + one-liner: [ i686-linux, x86_64-linux, x86_64-darwin ] + oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] + onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAFP-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenAL: [ x86_64-darwin ] + OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] + openexchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] + openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenGLCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + opengles: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenGL: [ x86_64-darwin ] + openid: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + openpgp-crypto-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + openpgp-Crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] + openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] + opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-typerep: [ i686-linux ] + open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-witness: [ i686-linux, x86_64-linux, x86_64-darwin ] + Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] + optimusprime: [ i686-linux, x86_64-linux, x86_64-darwin ] + OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] + OrderedBits: [ i686-linux, x86_64-linux, x86_64-darwin ] + order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] + order-statistics: [ i686-linux ] + orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] + origami: [ i686-linux, x86_64-linux, x86_64-darwin ] + osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] + OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] + ot: [ i686-linux, x86_64-linux, x86_64-darwin ] + package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] + packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + pam: [ x86_64-darwin ] + panda: [ i686-linux, x86_64-linux, x86_64-darwin ] + PandocAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] + papillon: [ i686-linux, x86_64-linux, x86_64-darwin ] + pappy: [ i686-linux, x86_64-linux, x86_64-darwin ] + paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] + Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] + parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + parameterized-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + parco: [ i686-linux, x86_64-linux, x86_64-darwin ] + parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsec2: [ i686-linux, x86_64-linux, x86_64-darwin ] + parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] + parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] + partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + partly: [ i686-linux, x86_64-linux, x86_64-darwin ] + passage: [ i686-linux, x86_64-linux, x86_64-darwin ] + pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] + pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] + pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] + paypal-adaptive-hoops: [ i686-linux ] + paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + pb: [ i686-linux, x86_64-linux, x86_64-darwin ] + PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] + PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] + peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] + pec: [ i686-linux, x86_64-linux, x86_64-darwin ] + peg: [ i686-linux, x86_64-linux, x86_64-darwin ] + penny-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] + penny: [ i686-linux, x86_64-linux, x86_64-darwin ] + penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + peparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] + PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] + perm: [ i686-linux, x86_64-linux, x86_64-darwin ] + PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] + permute: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] + pesca: [ i686-linux, x86_64-linux, x86_64-darwin ] + peyotls-codec: [ i686-linux, x86_64-linux, x86_64-darwin ] + peyotls: [ i686-linux, x86_64-linux, x86_64-darwin ] + pez: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] + pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] + phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] + phash: [ i686-linux, x86_64-linux, x86_64-darwin ] + phone-push: [ i686-linux, x86_64-linux, x86_64-darwin ] + phooey: [ i686-linux, x86_64-linux, x86_64-darwin ] + photoname: [ i686-linux, x86_64-linux, x86_64-darwin ] + phraskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + Phsu: [ i686-linux, x86_64-linux, x86_64-darwin ] + phybin: [ i686-linux, x86_64-linux, x86_64-darwin ] + pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] + pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] + picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] + piet: [ i686-linux, x86_64-linux, x86_64-darwin ] + piki: [ i686-linux, x86_64-linux, x86_64-darwin ] + pinboard: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-files: [ i686-linux ] + pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] + pit: [ i686-linux, x86_64-linux, x86_64-darwin ] + pkggraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + planar-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + plat: [ i686-linux, x86_64-linux, x86_64-darwin ] + plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-gtk3: [ x86_64-darwin ] + plot-gtk-ui: [ x86_64-darwin ] + plot-gtk: [ x86_64-darwin ] + plot-lab: [ x86_64-darwin ] + plot: [ x86_64-darwin ] + PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] + plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] + plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] + plumbers: [ i686-linux, x86_64-linux, x86_64-darwin ] + ply-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] + png-file: [ i686-linux, x86_64-linux, x86_64-darwin ] + pngload-fixed: [ i686-linux, x86_64-linux, x86_64-darwin ] + pngload: [ i686-linux, x86_64-linux, x86_64-darwin ] + pocket-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] + pointless-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] + pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pollutocracy: [ x86_64-darwin ] + polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] + polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] + polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + pontarius-mediaserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + pontarius-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] + pontarius-xpmn: [ i686-linux, x86_64-linux, x86_64-darwin ] + pool-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + poppler: [ i686-linux, x86_64-linux, x86_64-darwin ] + portaudio: [ x86_64-darwin ] + porte: [ i686-linux, x86_64-linux, x86_64-darwin ] + porter: [ i686-linux, x86_64-linux, x86_64-darwin ] + PortMidi: [ x86_64-darwin ] + ports: [ i686-linux, x86_64-linux, x86_64-darwin ] + posix-acl: [ i686-linux, x86_64-linux, x86_64-darwin ] + posix-timer: [ x86_64-darwin ] + posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] + PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] + postie: [ i686-linux, x86_64-linux, x86_64-darwin ] + postmaster: [ i686-linux, x86_64-linux, x86_64-darwin ] + potrace-diagrams: [ x86_64-darwin ] + powermate: [ i686-linux, x86_64-linux, x86_64-darwin ] + powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] + pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] + precis: [ i686-linux, x86_64-linux, x86_64-darwin ] + prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] + pregame: [ i686-linux, x86_64-linux, x86_64-darwin ] + prelude-generalize: [ i686-linux, x86_64-linux, x86_64-darwin ] + prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + press: [ i686-linux, x86_64-linux, x86_64-darwin ] + PrimitiveArray: [ i686-linux, x86_64-linux, x86_64-darwin ] + primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] + primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + printf-mauke: [ i686-linux, x86_64-linux, x86_64-darwin ] + Printf-TH: [ i686-linux, x86_64-linux, x86_64-darwin ] + printxosd: [ x86_64-darwin ] + PriorityChansConverger: [ i686-linux, x86_64-linux, x86_64-darwin ] + priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + ProbabilityMonads: [ i686-linux, x86_64-linux, x86_64-darwin ] + probable: [ i686-linux ] + processing: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-iterio: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-listlike: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] + process-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + proc: [ i686-linux, x86_64-linux, x86_64-darwin ] + procrastinating-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] + procrastinating-variable: [ i686-linux, x86_64-linux, x86_64-darwin ] + procstat: [ i686-linux, x86_64-linux, x86_64-darwin ] + prof2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] + profunctor-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + progress: [ i686-linux, x86_64-linux, x86_64-darwin ] + progression: [ i686-linux, x86_64-linux, x86_64-darwin ] + progressive: [ i686-linux, x86_64-linux, x86_64-darwin ] + proj4-hs-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + prolog-graph-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] + propane: [ i686-linux, x86_64-linux, x86_64-darwin ] + Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] + proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] + proteaaudio: [ x86_64-darwin ] + protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] + protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] + pub: [ i686-linux, x86_64-linux, x86_64-darwin ] + publicsuffixlistcreate: [ i686-linux, x86_64-linux, x86_64-darwin ] + pubnub: [ i686-linux, x86_64-linux, x86_64-darwin ] + pubsub: [ i686-linux, x86_64-linux, x86_64-darwin ] + puffytools: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugixml: [ x86_64-darwin ] + pugs-hsregex: [ i686-linux, x86_64-linux, x86_64-darwin ] + pugs-HsSyck: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pugs: [ i686-linux, x86_64-linux, x86_64-darwin ] + pulse-simple: [ x86_64-darwin ] + punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + Pup-Events: [ i686-linux, x86_64-linux, x86_64-darwin ] + puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] + pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] + push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] + push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] + push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] + puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] + puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] + pvd: [ i686-linux, x86_64-linux, x86_64-darwin ] + python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + qd: [ i686-linux, x86_64-linux, x86_64-darwin ] + qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] + qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + QuadEdge: [ i686-linux, x86_64-linux, x86_64-darwin ] + quantfin: [ i686-linux ] + quantum-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + qudb: [ i686-linux, x86_64-linux, x86_64-darwin ] + quenya-verb: [ i686-linux, x86_64-linux, x86_64-darwin ] + querystring-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] + QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] + QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] + Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] + quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] + quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + qux: [ i686-linux, x86_64-linux, x86_64-darwin ] + rabocsv2qif: [ i686-linux, x86_64-linux, x86_64-darwin ] + rad: [ i686-linux, x86_64-linux, x86_64-darwin ] + radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + radium: [ i686-linux, x86_64-linux, x86_64-darwin ] + rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] + rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ x86_64-darwin ] + rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] + ralist: [ i686-linux, x86_64-linux, x86_64-darwin ] + rallod: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] + Randometer: [ i686-linux ] + random-extras: [ i686-linux ] + random-fu: [ i686-linux ] + random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] + range: [ i686-linux, x86_64-linux, x86_64-darwin ] + rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] + Rasenschach: [ x86_64-darwin ] + raven-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] + rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] + rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] + rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] + re2: [ x86_64-darwin ] + reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-wx: [ x86_64-darwin ] + reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + really-simple-xml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + reasonable-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] + records: [ i686-linux, x86_64-linux, x86_64-darwin ] + records-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] + Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] + refh: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-tdfa-utf8: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-tre: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] + regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] + regions: [ i686-linux, x86_64-linux, x86_64-darwin ] + regions-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] + regions-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] + regions-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + regular-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + regular-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + reheat: [ i686-linux, x86_64-linux, x86_64-darwin ] + reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] + reify: [ i686-linux, x86_64-linux, x86_64-darwin ] + rei: [ i686-linux, x86_64-linux, x86_64-darwin ] + reinterpret-cast: [ i686-linux ] + remote: [ i686-linux, x86_64-linux, x86_64-darwin ] + remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] + reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-linear-algebra: [ x86_64-darwin ] + repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-sndfile: [ x86_64-darwin ] + repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] + repl: [ i686-linux, x86_64-linux, x86_64-darwin ] + RepLib: [ i686-linux, x86_64-linux, x86_64-darwin ] + repo-based-blog: [ i686-linux, x86_64-linux, x86_64-darwin ] + representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] + representable-profunctors: [ i686-linux, x86_64-linux, x86_64-darwin ] + representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + repr: [ i686-linux, x86_64-linux, x86_64-darwin ] + resistor-cube: [ x86_64-darwin ] + resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + respond: [ i686-linux, x86_64-linux, x86_64-darwin ] + restful-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + RESTng: [ i686-linux, x86_64-linux, x86_64-darwin ] + restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] + restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] + resumable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] + rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] + ReviewBoard: [ i686-linux, x86_64-linux, x86_64-darwin ] + rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] + rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rfc3339: [ i686-linux, x86_64-linux, x86_64-darwin ] + riak: [ i686-linux, x86_64-linux, x86_64-darwin ] + riak-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] + riemann: [ i686-linux, x86_64-linux, x86_64-darwin ] + riot: [ i686-linux, x86_64-linux, x86_64-darwin ] + ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] + ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] + risc386: [ i686-linux, x86_64-linux, x86_64-darwin ] + rivers: [ i686-linux, x86_64-linux, x86_64-darwin ] + RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] + rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + RMP: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAdesign: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAdraw: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAFold: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] + roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] + roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + roguestar: [ i686-linux, x86_64-linux, x86_64-darwin ] + RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + rope: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosa: [ i686-linux, x86_64-linux, x86_64-darwin ] + roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] + rotating-log: [ i686-linux, x86_64-linux, x86_64-darwin ] + rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] + roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + roundtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] + roundtrip-string: [ i686-linux, x86_64-linux, x86_64-darwin ] + roundtrip-xml: [ i686-linux, x86_64-linux, x86_64-darwin ] + route-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] + route-planning: [ i686-linux, x86_64-linux, x86_64-darwin ] + rowrecord: [ i686-linux, x86_64-linux, x86_64-darwin ] + rpc-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] + rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rpm: [ i686-linux, x86_64-linux, x86_64-darwin ] + rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] + rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] + rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + rtlsdr: [ x86_64-darwin ] + rubberband: [ x86_64-darwin ] + ruff: [ i686-linux, x86_64-linux, x86_64-darwin ] + ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] + RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] + safeint: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] + safer-file-handles-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + salvia-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + samtools-conduit: [ x86_64-darwin ] + samtools-enumerator: [ x86_64-darwin ] + samtools-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + samtools: [ x86_64-darwin ] + sarasvati: [ x86_64-darwin ] + sasl: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo-backends: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo-funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo-minisat: [ i686-linux, x86_64-linux, x86_64-darwin ] + satchmo-toysat: [ x86_64-darwin ] + satchmo: [ x86_64-darwin ] + sat: [ i686-linux, x86_64-linux, x86_64-darwin ] + sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] + scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] + scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + scat: [ i686-linux, x86_64-linux, x86_64-darwin ] + scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] + scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] + scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] + scion: [ i686-linux, x86_64-linux, x86_64-darwin ] + scope-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + scope: [ i686-linux, x86_64-linux, x86_64-darwin ] + scottish: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] + scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] + scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] + scroll: [ i686-linux, x86_64-linux, x86_64-darwin ] + scrz: [ i686-linux, x86_64-linux, x86_64-darwin ] + Scurry: [ i686-linux, x86_64-linux, x86_64-darwin ] + sde-solver: [ x86_64-darwin ] + sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-ttf: [ i686-linux, x86_64-linux, x86_64-darwin ] + SDL-mixer: [ x86_64-darwin ] + SDL-mpeg: [ x86_64-darwin ] + sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] + seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] + search: [ i686-linux, x86_64-linux, x86_64-darwin ] + secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] + second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] + secret-santa: [ i686-linux, x86_64-linux, x86_64-darwin ] + secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] + secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] + sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] + selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] + select: [ x86_64-darwin ] + selenium: [ i686-linux, x86_64-linux, x86_64-darwin ] + selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + selinux: [ i686-linux, x86_64-linux, x86_64-darwin ] + Semantique: [ i686-linux, x86_64-linux, x86_64-darwin ] + semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] + semi-iso: [ i686-linux, x86_64-linux, x86_64-darwin ] + semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] + sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] + sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] + senza: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqalign: [ i686-linux ] + SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] + seqloc-datafiles: [ i686-linux, x86_64-linux, x86_64-darwin ] + sequent-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + sequor: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-client: [ x86_64-darwin ] + servant-examples: [ x86_64-darwin ] + servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + serversession-backend-acid-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + servius: [ i686-linux, x86_64-linux, x86_64-darwin ] + ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] + SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + set-with: [ i686-linux, x86_64-linux, x86_64-darwin ] + sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] + sexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] + sext: [ i686-linux, x86_64-linux, x86_64-darwin ] + sfml-audio: [ x86_64-darwin ] + SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] + SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] + SGdemo: [ i686-linux, x86_64-linux, x86_64-darwin ] + SG: [ i686-linux, x86_64-linux, x86_64-darwin ] + sgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] + shadower: [ i686-linux, x86_64-linux, x86_64-darwin ] + shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] + shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] + shakespeare-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + shakespeare-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] + shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] + shared-memory: [ x86_64-darwin ] + she: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shellac-compatline: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shellac-haskeline: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shellac: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shellac-readline: [ i686-linux, x86_64-linux, x86_64-darwin ] + shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] + shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + shivers-cfg: [ i686-linux, x86_64-linux, x86_64-darwin ] + should-not-typecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] + shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] + Shu-thing: [ x86_64-darwin ] + sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] + sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + signals: [ i686-linux, x86_64-linux, x86_64-darwin ] + simd: [ i686-linux, x86_64-linux, x86_64-darwin ] + simgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] + SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + SimpleH: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] + simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-session: [ i686-linux, x86_64-linux, x86_64-darwin ] + simplessh: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] + simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] + sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] + sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] + sized: [ i686-linux, x86_64-linux, x86_64-darwin ] + sized-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] + skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] + skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + slack: [ i686-linux, x86_64-linux, x86_64-darwin ] + slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] + sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallpt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + smartcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + smartGroup: [ i686-linux, x86_64-linux, x86_64-darwin ] + smartword: [ i686-linux, x86_64-linux, x86_64-darwin ] + sme: [ i686-linux, x86_64-linux, x86_64-darwin ] + Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] + smsaero: [ x86_64-darwin ] + smtlib2: [ i686-linux, x86_64-linux, x86_64-darwin ] + smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] + smtps-gmail: [ i686-linux, x86_64-linux, x86_64-darwin ] + snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-app: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-actionlog: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-css-min: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-environments: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-mongodb-minimalistic: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-oauth: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-redson: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-riak: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-sedna: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-typed-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] + snaplet-wordpress: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] + snappy-conduit: [ x86_64-darwin ] + snappy-framing: [ x86_64-darwin ] + snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + snappy: [ x86_64-darwin ] + snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] + sneakyterm: [ x86_64-darwin ] + sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] + SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + snm: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowglobe: [ x86_64-darwin ] + snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] + Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] + SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] + sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] + socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] + sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] + SoOSiM: [ i686-linux, x86_64-linux, x86_64-darwin ] + sorted: [ i686-linux, x86_64-linux, x86_64-darwin ] + sound-collage: [ i686-linux, x86_64-linux, x86_64-darwin ] + source-code-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] + soxlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + soyuz: [ i686-linux, x86_64-linux, x86_64-darwin ] + SpaceInvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] + SpacePrivateers: [ i686-linux, x86_64-linux, x86_64-darwin ] + spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparsebit: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparsecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + sparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + spata: [ i686-linux, x86_64-linux, x86_64-darwin ] + special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] + specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + speculation-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] + sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + spice: [ i686-linux, x86_64-linux, x86_64-darwin ] + spike: [ i686-linux, x86_64-linux, x86_64-darwin ] + splaytree: [ i686-linux, x86_64-linux, x86_64-darwin ] + spline3: [ i686-linux ] + splines: [ i686-linux, x86_64-linux, x86_64-darwin ] + split-record: [ i686-linux, x86_64-linux, x86_64-darwin ] + splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + splot: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] + spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] + Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] + spsa: [ i686-linux, x86_64-darwin ] + spy: [ i686-linux, x86_64-linux, x86_64-darwin ] + sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] + sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + sql-simple-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] + sql-simple-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] + sql-simple-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] + sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] + sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] + sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] + stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] + starrover2: [ i686-linux, x86_64-linux, x86_64-darwin ] + stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] + StatisticalMethods: [ i686-linux ] + statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] + statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + statistics-hypergeometric-genvar: [ i686-linux ] + statistics: [ i686-linux ] + statistics-linreg: [ i686-linux ] + stats: [ i686-linux ] + stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] + steeloverseer: [ x86_64-darwin ] + step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] + stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] + stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] + Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] + storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + storablevector-carray: [ i686-linux, x86_64-linux, x86_64-darwin ] + storablevector: [ i686-linux, x86_64-linux, x86_64-darwin ] + storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] + stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + streaming-histogram: [ i686-linux ] + StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] + strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] + string: [ i686-linux, x86_64-linux, x86_64-darwin ] + stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] + structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + structures: [ i686-linux, x86_64-linux, x86_64-darwin ] + stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] + subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] + sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] + sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] + sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] + sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + sunroof-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] + superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + supero: [ i686-linux, x86_64-linux, x86_64-darwin ] + supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] + SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] + SVGFonts: [ x86_64-darwin ] + svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] + swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + swf: [ i686-linux, x86_64-linux, x86_64-darwin ] + swift-lda: [ i686-linux, x86_64-linux, x86_64-darwin ] + sws: [ i686-linux, x86_64-linux, x86_64-darwin ] + syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + sync: [ i686-linux, x86_64-linux, x86_64-darwin ] + sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntactic: [ i686-linux ] + syntax-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-example-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] + SyntaxMacros: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-printer: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-trees-fork-bairyn: [ i686-linux, x86_64-linux, x86_64-darwin ] + syntax-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer-alsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer: [ i686-linux, x86_64-linux, x86_64-darwin ] + synthesizer-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] + Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ] + system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ] + system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] + system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] + tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] + tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + ta: [ i686-linux, x86_64-linux, x86_64-darwin ] + Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] + takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] + tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] + tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] + tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] + tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + tamper: [ i686-linux, x86_64-linux, x86_64-darwin ] + task: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] + TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] + TBit: [ x86_64-darwin ] + tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + tccli: [ i686-linux, x86_64-linux, x86_64-darwin ] + tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] + tdd-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] + teams: [ i686-linux, x86_64-linux, x86_64-darwin ] + telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] + template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] + template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] + templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] + tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] + temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] + tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] + tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] + terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] + tersmu: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] + testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] + testPkg: [ i686-linux, x86_64-linux, x86_64-darwin ] + testrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] + tetris: [ i686-linux, x86_64-linux, x86_64-darwin ] + tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] + texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] + textPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + texts: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + tftp: [ x86_64-darwin ] + Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] + theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + thih: [ i686-linux, x86_64-linux, x86_64-darwin ] + thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] + Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + th-kinds: [ i686-linux, x86_64-linux, x86_64-darwin ] + thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] + throttle: [ i686-linux, x86_64-linux, x86_64-darwin ] + tianbar: [ x86_64-darwin ] + tickle: [ i686-linux ] + tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] + TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + tidal-midi: [ x86_64-darwin ] + tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] + tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] + timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] + timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-exts: [ i686-linux ] + time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeout-control: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] + TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-qq: [ i686-linux ] + time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] + timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] + TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] + TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] + Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] + tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] + tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + todos: [ i686-linux, x86_64-linux, x86_64-darwin ] + to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] + toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokyotyrant-haskell: [ x86_64-darwin ] + tomato-rubato-openal: [ x86_64-darwin ] + toml: [ i686-linux, x86_64-linux, x86_64-darwin ] + Top: [ i686-linux, x86_64-linux, x86_64-darwin ] + topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] + torch: [ i686-linux, x86_64-linux, x86_64-darwin ] + to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] + to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] + tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] + trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] + transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] + transformations: [ i686-linux ] + transformers-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] + translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] + treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + treeviz: [ i686-linux, x86_64-linux, x86_64-darwin ] + tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] + TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] + TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] + true-name: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] + tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] + tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] + tup-functor: [ i686-linux, x86_64-linux, x86_64-darwin ] + tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] + tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] + tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] + turing-music: [ x86_64-darwin ] + twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp: [ x86_64-darwin ] + twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] + twill: [ i686-linux, x86_64-linux, x86_64-darwin ] + twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] + twine: [ i686-linux, x86_64-linux, x86_64-darwin ] + twisty: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitch: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + twitter-types-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + tx: [ i686-linux, x86_64-linux, x86_64-darwin ] + TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] + typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] + typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] + typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-equality-check: [ i686-linux, x86_64-linux, x86_64-darwin ] + typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] + TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-int: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-level-bst: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-level: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-level-sets: [ i686-linux, x86_64-linux, x86_64-darwin ] + typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] + typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-settheory: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-spine: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-structure: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + typography-geometry: [ i686-linux, x86_64-linux, x86_64-darwin ] + tz: [ i686-linux, x86_64-linux, x86_64-darwin ] + uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] + uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] + uconv: [ i686-linux, x86_64-linux, x86_64-darwin ] + udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] + udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] + udev: [ i686-linux, x86_64-linux, x86_64-darwin ] + ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] + UISF: [ x86_64-darwin ] + UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] + unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] + unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] + unbound: [ i686-linux, x86_64-linux, x86_64-darwin ] + unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] + unicoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] + unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + units-defs: [ i686-linux, x86_64-linux, x86_64-darwin ] + units: [ i686-linux, x86_64-linux, x86_64-darwin ] + unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] + universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + Unixutils-shadow: [ x86_64-darwin ] + unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] + unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] + unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] + up: [ i686-linux, x86_64-linux, x86_64-darwin ] + uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] + upskirt: [ i686-linux, x86_64-linux, x86_64-darwin ] + ureader: [ i686-linux, x86_64-linux, x86_64-darwin ] + urembed: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-enumerator-file: [ i686-linux, x86_64-linux, x86_64-darwin ] + uri-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + urlcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + urldecode: [ i686-linux, x86_64-linux, x86_64-darwin ] + urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] + url-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] + urxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + usb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + usb-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + usb-safe: [ i686-linux, x86_64-linux, x86_64-darwin ] + UTFTConverter: [ i686-linux, x86_64-linux, x86_64-darwin ] + uuagc-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + uu-tc: [ i686-linux, x86_64-linux, x86_64-darwin ] + uvector-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] + uvector: [ i686-linux, x86_64-linux, x86_64-darwin ] + v4l2-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + v4l2: [ i686-linux, x86_64-linux, x86_64-darwin ] + vacuum-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + vacuum-graphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] + vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] + vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + validate: [ i686-linux, x86_64-linux, x86_64-darwin ] + validate-input: [ i686-linux, x86_64-linux, x86_64-darwin ] + vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] + varan: [ i686-linux ] + var: [ i686-linux, x86_64-linux, x86_64-darwin ] + vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcache-trie: [ x86_64-darwin ] + vcache: [ x86_64-darwin ] + vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcsgui: [ x86_64-darwin ] + Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] + Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + vect-opengl: [ x86_64-darwin ] + vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-functorlazy: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-instances-collections: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-read-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] + verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + ViennaRNA-bindings: [ x86_64-darwin ] + vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] + vimus: [ i686-linux, x86_64-darwin ] + vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + vinyl-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + virthualenv: [ i686-linux, x86_64-linux, x86_64-darwin ] + vision: [ i686-linux, x86_64-linux, x86_64-darwin ] + visual-graphrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + visual-prof: [ i686-linux, x86_64-linux, x86_64-darwin ] + vk-aws-route53: [ i686-linux, x86_64-linux, x86_64-darwin ] + VKHS: [ i686-linux, x86_64-linux, x86_64-darwin ] + vorbiscomment: [ i686-linux, x86_64-linux, x86_64-darwin ] + vowpal-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + voyeur: [ i686-linux, x86_64-linux, x86_64-darwin ] + vtegtk3: [ i686-linux, x86_64-linux, x86_64-darwin ] + vte: [ x86_64-darwin ] + vty-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + vty-menu: [ i686-linux, x86_64-linux, x86_64-darwin ] + vty-ui-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-eventsource: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-handler-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-consul: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-crowd: [ i686-linux, x86_64-darwin ] + wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ] + waitra: [ i686-linux, x86_64-linux, x86_64-darwin ] + warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + warp-tls-uid: [ i686-linux, x86_64-linux, x86_64-darwin ] + WashNGo: [ i686-linux, x86_64-linux, x86_64-darwin ] + watchdog: [ i686-linux, x86_64-linux, x86_64-darwin ] + watcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + watchit: [ i686-linux, x86_64-linux, x86_64-darwin ] + wavesurfer: [ i686-linux, x86_64-linux, x86_64-darwin ] + weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] + WebBits-multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + WebCont: [ i686-linux, x86_64-linux, x86_64-darwin ] + webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] + webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] + webify: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkitgtk3-javascriptcore: [ x86_64-darwin ] + webkitgtk3: [ x86_64-darwin ] + webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + webkit: [ x86_64-darwin ] + web-mongrel2: [ i686-linux, x86_64-linux, x86_64-darwin ] + Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] + webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] + wedged: [ i686-linux, x86_64-linux, x86_64-darwin ] + weighted-regexp: [ i686-linux, x86_64-linux, x86_64-darwin ] + welshy: [ i686-linux, x86_64-linux, x86_64-darwin ] + Wheb: [ i686-linux, x86_64-linux, x86_64-darwin ] + wheb-mongo: [ i686-linux, x86_64-linux, x86_64-darwin ] + wheb-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] + wheb-strapped: [ i686-linux, x86_64-linux, x86_64-darwin ] + whim: [ i686-linux, x86_64-linux, x86_64-darwin ] + whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] + WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] + wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] + windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] + winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] + winio: [ i686-linux, x86_64-linux, x86_64-darwin ] + WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] + wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + WMSigner: [ i686-linux ] + wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] + woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] + wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] + word24: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordcloud: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordexp: [ x86_64-darwin ] + Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] + WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] + WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordpass: [ i686-linux ] + wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] + wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + wright: [ i686-linux, x86_64-linux, x86_64-darwin ] + wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] + wumpus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + wumpus-drawing: [ i686-linux, x86_64-linux, x86_64-darwin ] + wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] + wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxcore: [ x86_64-darwin ] + wxc: [ x86_64-darwin ] + WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] + WxGeneric: [ x86_64-darwin ] + wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] + wx: [ x86_64-darwin ] + wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] + X11-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + X11-rm: [ i686-linux, x86_64-linux, x86_64-darwin ] + X11-xdamage: [ i686-linux, x86_64-linux, x86_64-darwin ] + X11-xfixes: [ i686-linux, x86_64-linux, x86_64-darwin ] + x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] + x509-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + xattr: [ x86_64-darwin ] + xbattbar: [ x86_64-darwin ] + xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + x-dsp: [ i686-linux, x86_64-linux, x86_64-darwin ] + Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] + xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] + xhaskell-library: [ i686-linux, x86_64-linux, x86_64-darwin ] + xhb-ewmh: [ i686-linux, x86_64-linux, x86_64-darwin ] + xine: [ i686-linux, x86_64-linux, x86_64-darwin ] + xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + XInput: [ i686-linux, x86_64-linux, x86_64-darwin ] + xkbcommon: [ x86_64-darwin ] + xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] + xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml2json: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml2x: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + XmlHtmlWriter: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-push: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmltv: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmms2-client-glib: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmms2-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + XMMS: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmobar: [ x86_64-darwin ] + xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + xosd: [ x86_64-darwin ] + xournal-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] + xournal-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + xournal-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + xournal-render: [ i686-linux, x86_64-linux, x86_64-darwin ] + xournal-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] + XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] + xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] + xtc: [ x86_64-darwin ] + y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] + YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] + yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] + yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ] + YamlReference: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-rpc-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaml-rpc-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa2048: [ x86_64-darwin ] + yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] + yampa-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarr: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarr-image-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + yate: [ i686-linux, x86_64-linux, x86_64-darwin ] + yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] + ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-bin: [ x86_64-darwin ] + yesod-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-datatables: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-eventsource: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-media-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-pagination: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-paginator: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-session-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-static-angular: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-tableview: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-test-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-vend: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-worker: [ i686-linux, x86_64-linux, x86_64-darwin ] + YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] + yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-fuzzy-open: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-monokai: [ x86_64-darwin ] + yi-rope: [ x86_64-darwin ] + yi-snippet: [ x86_64-darwin ] + yi-solarized: [ x86_64-darwin ] + yi-spolsky: [ x86_64-darwin ] + yi-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi: [ x86_64-darwin ] + yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] + Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] + Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] + yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] + york-lava: [ i686-linux, x86_64-linux, x86_64-darwin ] + yql: [ i686-linux, x86_64-linux, x86_64-darwin ] + yuiGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] + yuuko: [ i686-linux, x86_64-linux, x86_64-darwin ] + yxdb-utils: [ i686-linux ] + zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] + zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] + zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] + zeromq3-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ] + ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ] + zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] + zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] + zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoom-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoom-cache-pcm: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoom-cache-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + zoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + zot: [ i686-linux, x86_64-linux, x86_64-darwin ] + zsh-battery: [ i686-linux, x86_64-linux, x86_64-darwin ] + ztail: [ i686-linux, x86_64-linux, x86_64-darwin ] + Zwaluw: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index f76719a3117c..3442e8730806 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -22,7 +22,8 @@ , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" -, hydraPlatforms ? ghc.meta.hydraPlatforms or ghc.meta.platforms +, platforms ? ghc.meta.platforms +, hydraPlatforms ? platforms , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable , jailbreak ? false @@ -31,7 +32,6 @@ , doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8" , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [] -, platforms ? ghc.meta.platforms , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [] , testTarget ? "" , broken ? false @@ -130,7 +130,7 @@ in assert allPkgconfigDepends != [] -> pkgconfig != null; stdenv.mkDerivation ({ - name = "${optionalString (hasActiveLibrary && pname != "ghcjs") "haskell-"}${pname}-${version}"; + name = "${pname}-${version}"; pos = builtins.unsafeGetAttrPos "pname" args; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 88c383672b1b..9f4e68ed2f97 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17,6 +17,7 @@ self: { homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples"; description = "Examples of 3D graphics programming with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "3dmodels" = callPackage @@ -463,6 +464,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -1231,6 +1233,7 @@ self: { homepage = "https://github.com/choener/BenchmarkHistory"; description = "Benchmark functions with history"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "BerkeleyDB" = callPackage @@ -1287,6 +1290,7 @@ self: { homepage = "https://github.com/mchakravarty/BigPixel"; description = "Image editor for pixel art"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Binpack" = callPackage @@ -1664,7 +1668,7 @@ self: { executableHaskellDepends = [ base BlogLiterately ]; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "BluePrintCSS" = callPackage @@ -1709,7 +1713,6 @@ self: { homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html"; description = "A simple document organizer with some wiki functionality"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Boolean" = callPackage @@ -2218,6 +2221,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cabal_1_20_0_3" = callPackage @@ -2243,6 +2247,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cabal_1_22_4_0" = callPackage @@ -2269,6 +2274,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cabal-ide-backend" = callPackage @@ -2449,7 +2455,7 @@ self: { homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "Diagrams backend for Charts"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Chart-gtk" = callPackage @@ -2794,10 +2800,9 @@ self: { ({ mkDerivation, async, base }: mkDerivation { pname = "Concurrential"; - version = "0.5.0.0"; - sha256 = "6b175a046f69049ad2df298bed113e562662aa1e106ee72360697f1b270b94b9"; + version = "0.5.0.1"; + sha256 = "addb2abcf81ad9619d42e2f25e5866f7e998f29527409e40c7954078cc9fd676"; libraryHaskellDepends = [ async base ]; - jailbreak = true; homepage = "http://github.com/avieth/Concurrential"; description = "Mix concurrent and sequential computation"; license = stdenv.lib.licenses.bsd3; @@ -3351,7 +3356,6 @@ self: { HUnit integer-gmp QuickCheck SHA tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; description = "Implementation of DSA, based on the description of FIPS 186-4"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -4305,7 +4309,6 @@ self: { homepage = "http://elm-lang.org"; description = "The Elm language module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Emping" = callPackage @@ -4549,20 +4552,16 @@ self: { "Euterpea" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring - , Cabal, CCA, containers, deepseq, ghc-prim, HCodecs, heap - , markov-chain, monadIO, mtl, PortMidi, pure-fft, QuickCheck - , random, stm, syb, template-haskell, UISF + , Cabal, containers, deepseq, ghc-prim, HCodecs, heap, markov-chain + , PortMidi, pure-fft, QuickCheck, random, stm, UISF }: mkDerivation { pname = "Euterpea"; - version = "1.0.0"; - sha256 = "ba6d412a87431694aa50b7e1fb398b1f8671d3bbf1c6da3ef961e9436ad6cc31"; - revision = "1"; - editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd"; + version = "1.1.0"; + sha256 = "b9f311ce03c58e3a8da502713d5ac5cd2463e76a9bc4c7b2b3556de2e42d58b4"; libraryHaskellDepends = [ - array arrows base bytestring CCA containers deepseq ghc-prim - HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm - syb template-haskell UISF + array arrows base bytestring containers deepseq ghc-prim HCodecs + heap markov-chain PortMidi pure-fft random stm UISF ]; testHaskellDepends = [ ansi-terminal base Cabal QuickCheck ]; jailbreak = true; @@ -4687,6 +4686,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -4703,6 +4703,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTPLine" = callPackage @@ -4819,6 +4820,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Feval" = callPackage + ({ mkDerivation, base, containers, mtl, parsec }: + mkDerivation { + pname = "Feval"; + version = "1.0.0.1"; + sha256 = "57d8d22edddce21abb7f690a3609a2daca841642d52e3641986d1e58a57b8b56"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base containers mtl parsec ]; + jailbreak = true; + homepage = "http://github.com/burz/Feval"; + description = "Evaluation using F-Algebras"; + license = stdenv.lib.licenses.mit; + }) {}; + "FieldTrip" = callPackage ({ mkDerivation, base, GLUT, graphicsFormats, MemoTrie, old-time , OpenGL, TypeCompose, vector-space @@ -5022,11 +5038,11 @@ self: { ({ mkDerivation, base, containers, HUnit, parsec }: mkDerivation { pname = "Folly"; - version = "0.1.3.0"; - sha256 = "f155359eff68c5873057836478883804335275aa585d405774bd35f5a07efd79"; + version = "0.2.0.0"; + sha256 = "47ceb0db6bbfe935e0d931a5d6d4425e46fd059657398ae0be67f2f0e714ee05"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers ]; + libraryHaskellDepends = [ base containers parsec ]; executableHaskellDepends = [ base containers HUnit parsec ]; homepage = "https://github.com/dillonhuff/Folly"; description = "A first order logic library in Haskell"; @@ -5200,6 +5216,7 @@ self: { homepage = "http://joyful.com/fungen"; description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Fungi" = callPackage @@ -5274,6 +5291,7 @@ self: { homepage = "http://haskell.org/haskellwiki/GLFW"; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLFW-OGL" = callPackage @@ -5302,6 +5320,7 @@ self: { testHaskellDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit ]; + jailbreak = true; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -5322,6 +5341,7 @@ self: { jailbreak = true; description = "GLFW-b demo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLFW-task" = callPackage @@ -5337,6 +5357,7 @@ self: { homepage = "http://github.com/ninegua/GLFW-task"; description = "GLFW utility functions to use together with monad-task"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GLHUI" = callPackage @@ -5349,6 +5370,7 @@ self: { librarySystemDepends = [ libX11 mesa ]; description = "Open OpenGL context windows in X11 with libX11"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;}; "GLMatrix" = callPackage @@ -5375,6 +5397,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A raw binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUT" = callPackage @@ -5392,25 +5415,25 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;}; "GLUtil" = callPackage - ({ mkDerivation, array, base, bytestring, containers, cpphs - , directory, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw + ({ mkDerivation, array, base, bytestring, containers, directory + , filepath, hpp, JuicyPixels, linear, OpenGL, OpenGLRaw , transformers, vector }: mkDerivation { pname = "GLUtil"; - version = "0.8.6"; - sha256 = "c33530e1a8a83700950867291e4f12908ed6bf09fc737556b912d94672a0e697"; + version = "0.8.7"; + sha256 = "4d7c2184d3aff8d124f34f2e2ebe6021201e8a174d8bb5ebabe3a50451a71642"; libraryHaskellDepends = [ - array base bytestring containers directory filepath JuicyPixels + array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector ]; - libraryToolDepends = [ cpphs ]; - jailbreak = true; description = "Miscellaneous OpenGL utilities"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "GPX" = callPackage @@ -5433,21 +5456,22 @@ self: { }) {}; "GPipe" = callPackage - ({ mkDerivation, base, Boolean, containers, GLUT, list-tries - , OpenGL, transformers, Vec, Vec-Boolean + ({ mkDerivation, base, Boolean, containers, exception-transformers + , gl, hashtables, linear, transformers }: mkDerivation { pname = "GPipe"; - version = "1.4.1"; - sha256 = "a32faf7b33694017a607b8a8d2263ea3ab664c77c3575de37d37fd7a8f7d3d70"; + version = "2.0.1"; + sha256 = "43cf2aa28f7209d2c70c096222d3143d44d894f971954603101eb767ce8c5785"; + revision = "1"; + editedCabalFile = "25b9970c58b8d075ab27803de4dfff7f4bf0e12336c03eaa2054b23fcf595ef5"; libraryHaskellDepends = [ - base Boolean containers GLUT list-tries OpenGL transformers Vec - Vec-Boolean + base Boolean containers exception-transformers gl hashtables linear + transformers ]; - jailbreak = true; - homepage = "http://www.haskell.org/haskellwiki/GPipe"; - description = "A functional graphics API for programmable GPUs"; - license = stdenv.lib.licenses.bsd3; + homepage = "http://tobbebex.blogspot.se/"; + description = "Typesafe functional GPU graphics programming"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -5485,6 +5509,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "GPipe-GLFW" = callPackage + ({ mkDerivation, base, GLFW-b, GPipe, transformers }: + mkDerivation { + pname = "GPipe-GLFW"; + version = "1.0"; + sha256 = "1d5fbf132f11a5378d19ac31361a0783d0e3dd4324809df4fa0fbabcdbb34b5c"; + libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; + homepage = "https://github.com/plredmond/GPipe-GLFW"; + description = "GLFW OpenGL context creation for GPipe"; + license = stdenv.lib.licenses.mit; + }) {}; + "GPipe-TextureLoad" = callPackage ({ mkDerivation, base, bitmap, GPipe, stb-image }: mkDerivation { @@ -5584,6 +5620,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6017,18 +6054,16 @@ self: { "Graphalyze" = callPackage ({ mkDerivation, array, base, bktrees, containers, directory, fgl - , filepath, graphviz, old-locale, pandoc, process, random, text - , time + , filepath, graphviz, pandoc, process, random, text, time }: mkDerivation { pname = "Graphalyze"; - version = "0.14.1.0"; - sha256 = "e3c322cd9cf02266a37cdb71142680ee74356dcc2c08c850be575303e885d95f"; + version = "0.14.1.1"; + sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f"; libraryHaskellDepends = [ array base bktrees containers directory fgl filepath graphviz - old-locale pandoc process random text time + pandoc process random text time ]; - jailbreak = true; description = "Graph-Theoretic Analysis library"; license = "unknown"; }) {}; @@ -6186,6 +6221,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "H" = callPackage + ({ mkDerivation, base, bytestring, cmdargs, directory, file-embed + , inline-r, pretty, process, singletons, tasty, tasty-golden + , tasty-hunit, temporary-rc, text, vector + }: + mkDerivation { + pname = "H"; + version = "0.7.0.0"; + sha256 = "52ee637c754b8629f209e5b15c7b19437cd7039f660f7bc32e5a83c548b8100e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring cmdargs file-embed inline-r pretty process + temporary-rc vector + ]; + testHaskellDepends = [ + base bytestring directory inline-r process singletons tasty + tasty-golden tasty-hunit text vector + ]; + description = "The Haskell/R mixed programming environment"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HARM" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -6500,6 +6559,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mpfr;}; + "HFrequencyQueue" = callPackage + ({ mkDerivation, base, c-storable-deriving }: + mkDerivation { + pname = "HFrequencyQueue"; + version = "0.2.0.0"; + sha256 = "b03c5de4cbb14d379f3555698a03a076fb2d10c748c2a7054b83c74f95e30626"; + libraryHaskellDepends = [ base c-storable-deriving ]; + jailbreak = true; + homepage = "https://github.com/Bellaz/HfrequencyList"; + description = "A Queue with a random (weighted) pick function"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HFuse" = callPackage ({ mkDerivation, base, bytestring, fuse, unix }: mkDerivation { @@ -6516,6 +6589,7 @@ self: { homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGL" = callPackage @@ -6531,23 +6605,23 @@ self: { }) {}; "HGamer3D" = callPackage - ({ mkDerivation, base, HGamer3D-Audio, HGamer3D-Common - , HGamer3D-Data, HGamer3D-Graphics3D, HGamer3D-InputSystem - , HGamer3D-Network + ({ mkDerivation, base, bytestring, cereal, clock, containers + , directory, filepath, hgamer3d0, messagepack, text, Urho3D, vect }: mkDerivation { pname = "HGamer3D"; - version = "0.5.0"; - sha256 = "670dbc3b159981e248800007a89a281393771fca68111f703e70fce7eb95b302"; + version = "0.6.0"; + sha256 = "e0d1a900db2d0e10b96c242508485789ca31e5a074978fb99a4804b78cc13db7"; libraryHaskellDepends = [ - base HGamer3D-Audio HGamer3D-Common HGamer3D-Data - HGamer3D-Graphics3D HGamer3D-InputSystem HGamer3D-Network + base bytestring cereal clock containers directory filepath + messagepack text vect ]; + librarySystemDepends = [ hgamer3d0 Urho3D ]; homepage = "http://www.hgamer3d.org"; - description = "A Toolset for the Haskell Game Programmer"; + description = "Toolset for the Haskell Game Programmer"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {Urho3D = null; hgamer3d0 = null;}; "HGamer3D-API" = callPackage ({ mkDerivation, base, haskell98, HGamer3D-Data @@ -7133,7 +7207,6 @@ self: { homepage = "https://github.com/atzeus/HMap"; description = "Fast heterogeneous maps and unconstrained typeable like functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HNM" = callPackage @@ -7186,23 +7259,24 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) opencv;}; "HPDF" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers, mtl - , random, vector, zlib + ({ mkDerivation, array, base, base64-bytestring, binary, bytestring + , containers, mtl, random, vector, zlib }: mkDerivation { pname = "HPDF"; - version = "1.4.7"; - sha256 = "13476b1e0d4d2a2f88255d0928fd11d884f2a3f9f5288f31cef73610f37a6b72"; + version = "1.4.8"; + sha256 = "717d05dda2a5bcdc482056afa6543774a6fcd0e180232f24bcd6240ddf489690"; libraryHaskellDepends = [ - array base binary bytestring containers mtl random vector zlib + array base base64-bytestring binary bytestring containers mtl + random vector zlib ]; homepage = "http://www.alpheccar.org"; description = "Generation of PDF documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HPath" = callPackage @@ -7671,18 +7745,6 @@ self: { }) {}; "HUnit" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "HUnit"; - version = "1.2.5.2"; - sha256 = "0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41"; - libraryHaskellDepends = [ base deepseq ]; - homepage = "http://hunit.sourceforge.net/"; - description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HUnit_1_3_0_0" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -7711,20 +7773,19 @@ self: { "HUnit-Plus" = callPackage ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers - , directory, hashable, hexpat, hostname, old-locale, parsec, time - , timeit + , directory, hashable, hexpat, hostname, parsec, time, timeit }: mkDerivation { pname = "HUnit-Plus"; - version = "1.0.1"; - sha256 = "71929ba45bd420d8d2061dc877ed0d82ba574155ce0be6d67b6459148129045e"; + version = "1.1.0"; + sha256 = "9cde0930c46c02833e82b10519bcc841ce5186a62be3bb29971538e85a5fcb74"; libraryHaskellDepends = [ base bytestring Cabal cmdargs containers hashable hexpat hostname - old-locale parsec time timeit + parsec time timeit ]; testHaskellDepends = [ base bytestring Cabal cmdargs containers directory hashable hexpat - hostname old-locale parsec time timeit + hostname parsec time timeit ]; homepage = "https://github.com/emc2/HUnit-Plus"; description = "A test framework building on HUnit"; @@ -8208,6 +8269,7 @@ self: { libraryHaskellDepends = [ base hmatrix ]; description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "HaskellNN" = callPackage @@ -8525,8 +8587,8 @@ self: { }: mkDerivation { pname = "Hoed"; - version = "0.2.2"; - sha256 = "9d2e9e4886e816c5e97e91c27cf007d18f0dafeb2acdf1e1d7023764b9a4d22c"; + version = "0.3.0"; + sha256 = "24f324d8cab517d23d14fd6350bd854b97226802b9ae3eb0e5f05cc344e95e3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -8534,7 +8596,7 @@ self: { RBTree regex-posix template-haskell threepenny-gui ]; homepage = "http://maartenfaddegon.nl"; - description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack"; + description = "Lighweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -8786,20 +8848,21 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, HUnit, network, old-locale - , openssl, test-framework, test-framework-hunit, time + ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network + , old-locale, openssl, test-framework, test-framework-hunit, time }: mkDerivation { pname = "HsOpenSSL"; version = "0.11.1.1"; sha256 = "4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1"; libraryHaskellDepends = [ - base bytestring network old-locale time + base bytestring integer-gmp network old-locale time ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "https://github.com/phonohawk/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -8828,7 +8891,6 @@ self: { ]; description = "Haskell integration with Parrot virtual machine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsPerl5" = callPackage @@ -9408,6 +9470,7 @@ self: { aeson base HUnit language-typescript stack-prism test-framework test-framework-hunit text ]; + jailbreak = true; homepage = "https://github.com/MedeaMelana/JsonGrammar2"; description = "Combinators for bidirectional JSON parsing"; license = stdenv.lib.licenses.bsd3; @@ -9448,14 +9511,11 @@ self: { ({ mkDerivation, base, bytestring, JuicyPixels, repa, vector }: mkDerivation { pname = "JuicyPixels-repa"; - version = "0.7"; - sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a"; - revision = "1"; - editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8"; + version = "0.7.0.1"; + sha256 = "767c5f7ab39b660f0a9e4c8a5af0564060f5319dee7f68306523344ddfdf3837"; libraryHaskellDepends = [ base bytestring JuicyPixels repa vector ]; - jailbreak = true; description = "Convenience functions to obtain array representations of images"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9569,6 +9629,7 @@ self: { homepage = "https://github.com/idontgetoutmuch/Kalman"; description = "A slightly extended Kalman filter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "KdTree" = callPackage @@ -9863,6 +9924,7 @@ self: { jailbreak = true; description = "A configurable and extensible neural network library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "LambdaPrettyQuote" = callPackage @@ -9955,7 +10017,6 @@ self: { ]; description = "A library for lattices"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LazyVault" = callPackage @@ -9986,7 +10047,6 @@ self: { homepage = "http://quasimal.com/projects/level_0.html"; description = "A Snake II clone written using SDL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LibClang" = callPackage @@ -10113,7 +10173,6 @@ self: { homepage = "http://github.com/yairchu/generator/tree"; description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListZipper" = callPackage @@ -10336,15 +10395,15 @@ self: { "MFlow" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , case-insensitive, clientsession, conduit, conduit-extra - , containers, directory, extensible-exceptions, http-types + , containers, cpphs, directory, extensible-exceptions, http-types , monadloc, mtl, old-time, parsec, pwstore-fast, random , RefSerialize, resourcet, stm, TCache, text, time, transformers , utf8-string, vector, wai, wai-extra, warp, warp-tls, Workflow }: mkDerivation { pname = "MFlow"; - version = "0.4.5.10"; - sha256 = "2c2e2c03b31f37f628e446cabaf544bf7b669d3e6a34b6c38798e89145c3b6c4"; + version = "0.4.5.11"; + sha256 = "789aceb77d0e2497a6194dba2677e32b003292075bc36db66f272f559234f25f"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring case-insensitive clientsession conduit conduit-extra containers directory @@ -10353,6 +10412,7 @@ self: { transformers utf8-string vector wai wai-extra warp warp-tls Workflow ]; + libraryToolDepends = [ cpphs ]; description = "stateful, RESTful web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -10545,7 +10605,6 @@ self: { libraryHaskellDepends = [ base containers stringtable-atom ]; description = "A meta-object system for Haskell based on Perl 6"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Metrics" = callPackage @@ -10708,6 +10767,7 @@ self: { executableHaskellDepends = [ base GLUT random ]; description = "A FRP library based on signal functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "MoeDict" = callPackage @@ -11846,6 +11906,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -11907,6 +11968,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/Opengl"; description = "A binding for the OpenGL graphics system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "OpenGLCheck" = callPackage @@ -12584,6 +12646,7 @@ self: { executableHaskellDepends = [ array base clock GLUT random ]; description = "An imaginary world"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "PortFusion" = callPackage @@ -12611,6 +12674,7 @@ self: { homepage = "http://haskell.org/haskellwiki/PortMidi"; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -12915,6 +12979,7 @@ self: { homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuickCheck" = callPackage @@ -13202,8 +13267,8 @@ self: { }: mkDerivation { pname = "RSA"; - version = "2.1.0.1"; - sha256 = "1b02096acd61e7fa477ca062773d47b7872e110cab594372699f8cba0632e454"; + version = "2.1.0.3"; + sha256 = "3227c31d00ba0bb1713bdfa7ba2f8e186b6f5d3a0c518a9884ad168cb6d9364a"; libraryHaskellDepends = [ base binary bytestring crypto-api crypto-pubkey-types pureMD5 SHA ]; @@ -13232,7 +13297,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Random123" = callPackage @@ -13277,6 +13342,7 @@ self: { homepage = "http://github.com/Soares/Randometer.hs"; description = "Randomness intuition trainer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "Range" = callPackage @@ -13338,6 +13404,7 @@ self: { homepage = "http://hub.darcs.net/martingw/Rasenschach"; description = "Soccer simulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Rasterific" = callPackage @@ -13622,7 +13689,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL-image" = callPackage @@ -13634,7 +13700,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_image"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL-mixer" = callPackage @@ -13648,7 +13713,7 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL-mpeg" = callPackage @@ -13661,7 +13726,7 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) smpeg;}; "SDL-ttf" = callPackage @@ -13673,7 +13738,6 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_ttf"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SDL2-ttf" = callPackage @@ -13904,6 +13968,7 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SVGPath" = callPackage @@ -14151,12 +14216,12 @@ self: { "ShellCheck" = callPackage ({ mkDerivation, base, containers, directory, json, mtl, parsec - , QuickCheck, regex-tdfa, transformers + , QuickCheck, regex-tdfa }: mkDerivation { pname = "ShellCheck"; - version = "0.3.8"; - sha256 = "c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a"; + version = "0.4.1"; + sha256 = "531af7608dea3f84b14a0d795fb9322c89850235992584d4b7a7b73dc47a3905"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14164,11 +14229,9 @@ self: { ]; executableHaskellDepends = [ base containers directory json mtl parsec QuickCheck regex-tdfa - transformers ]; testHaskellDepends = [ base containers directory json mtl parsec QuickCheck regex-tdfa - transformers ]; homepage = "http://www.shellcheck.net/"; description = "Shell script analysis tool"; @@ -14275,6 +14338,7 @@ self: { homepage = "http://www.geocities.jp/takascience/index_en.html"; description = "A vector shooter game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SimpleAES" = callPackage @@ -14504,15 +14568,14 @@ self: { }: mkDerivation { pname = "SourceGraph"; - version = "0.7.0.6"; - sha256 = "15cea96a69a24ab8cb8d481b5ce68d97cf50bc532dd6b8ec631bfb6e2a7dfa0e"; + version = "0.7.0.7"; + sha256 = "93734a272f17f6ff463c8ee7d016cd8a5f8fbace8eb5ceb99a4696fd729f99d4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal containers directory fgl filepath Graphalyze graphviz haskell-src-exts mtl multiset random ]; - jailbreak = true; description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; }) {}; @@ -14738,6 +14801,7 @@ self: { homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/"; description = "Collection of useful statistical methods"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "Stomp" = callPackage @@ -14967,6 +15031,7 @@ self: { jailbreak = true; description = "Utilities for condensed matter physics tight binding calculations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "TCache" = callPackage @@ -14985,6 +15050,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "THEff" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "THEff"; + version = "0.1.1.0"; + sha256 = "545725746fa7ea7d77cdb1447a1f2564ddfe36624c8a3118a7e8d0b009ef2462"; + libraryHaskellDepends = [ base template-haskell ]; + description = "TH implementation of effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "TTTAS" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -15166,6 +15242,7 @@ self: { base containers directory fgl graphviz interpolatedstring-perl6 mtl process text ]; + jailbreak = true; homepage = "https://github.com/testexplode/testexplode"; description = "Generates testcases from program-snippets"; license = stdenv.lib.licenses.gpl3; @@ -15545,14 +15622,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "TypeNat"; - version = "0.4.0.0"; - sha256 = "dbb6440bbe3dadf67d63ca652439db2988b1f47f99d65e7079ff506e516add6c"; + version = "0.4.0.1"; + sha256 = "e62ef42bad43ca0487d59fe7840313e31fe47a05f210cf37786dd6f5897504f3"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypingTester" = callPackage @@ -15570,19 +15645,20 @@ self: { }) {}; "UISF" = callPackage - ({ mkDerivation, arrows, base, containers, deepseq, GLFW, OpenGL - , stm, transformers + ({ mkDerivation, array, arrows, base, containers, deepseq, GLUT + , OpenGL, stm, transformers }: mkDerivation { pname = "UISF"; - version = "0.3.0.2"; - sha256 = "86a89d4e23d00916138d686e206240f0df282d971faf5e049c844c0f0ae1b344"; + version = "0.4.0.0"; + sha256 = "1d2084f1c81364b830fab4937901b83bee08addf6ea4e8123573b084cd80f3e7"; libraryHaskellDepends = [ - arrows base containers deepseq GLFW OpenGL stm transformers + array arrows base containers deepseq GLUT OpenGL stm transformers ]; homepage = "http://haskell.cs.yale.edu/"; description = "Library for Arrowized Graphical User Interfaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "UMM" = callPackage @@ -15634,6 +15710,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "UTFTConverter" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , JuicyPixels, time + }: + mkDerivation { + pname = "UTFTConverter"; + version = "0.1.0.0"; + sha256 = "5679130800bbb11e3a67ab638e97e733b4824edff8b8a6b2e88b7daaf56b934e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath JuicyPixels time + ]; + executableHaskellDepends = [ + base bytestring directory filepath JuicyPixels time + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec JuicyPixels time + ]; + jailbreak = true; + homepage = "www.github.com/cirquit/UTFTConverter"; + description = "Processing popular picture formats into .c or .raw format in RGB565"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Unique" = callPackage ({ mkDerivation, base, containers, extra, hashable , unordered-containers @@ -15677,6 +15779,7 @@ self: { homepage = "http://src.seereason.com/haskell-unixutils-shadow"; description = "A simple interface to shadow passwords (aka, shadow.h)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "Updater" = callPackage @@ -15841,14 +15944,15 @@ self: { homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "ViennaRNA v2 bindings"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ViennaRNAParser" = callPackage ({ mkDerivation, base, hspec, parsec, process }: mkDerivation { pname = "ViennaRNAParser"; - version = "1.2.5"; - sha256 = "0e70f2143820ec92e4841257cab2d1a803c5efc9b16c848902b089f21259834d"; + version = "1.2.6"; + sha256 = "2cfb08808da1a9d9969a073165aab1bd4188b7b0e4210d8e365b63f04ba4fe82"; libraryHaskellDepends = [ base parsec process ]; testHaskellDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; @@ -15923,6 +16027,7 @@ self: { jailbreak = true; description = "WebMoney authentication module"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "WURFL" = callPackage @@ -16358,6 +16463,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/WxGeneric"; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "X11" = callPackage @@ -16927,6 +17033,7 @@ self: { homepage = "https://github.com/pa-ba/abc-puzzle"; description = "Generate instances of the ABC Logic Puzzle"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "abcBridge" = callPackage @@ -17411,6 +17518,7 @@ self: { ]; description = "A replication backend for acid-state"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acid-state-tls" = callPackage @@ -18235,6 +18343,7 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson" = callPackage @@ -18562,6 +18671,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-value-parser" = callPackage + ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific, text + , unordered-containers, vector + }: + mkDerivation { + pname = "aeson-value-parser"; + version = "0.9.0"; + sha256 = "f53c0bd8a4fedb71ed74a2019b2d601ca3d315ae0db332e4f49d88f2ea68de8f"; + libraryHaskellDepends = [ + aeson base-prelude mtl-prelude scientific text unordered-containers + vector + ]; + homepage = "https://github.com/sannsyn/aeson-value-parser"; + description = "An API for parsing \"aeson\" JSON tree into Haskell types"; + license = stdenv.lib.licenses.mit; + }) {}; + "affine-invariant-ensemble-mcmc" = callPackage ({ mkDerivation, base, containers, mwc-random, primitive, split , vector @@ -18885,7 +19011,7 @@ self: { homepage = "http://github.com/dsorokin/aivika-experiment-diagrams"; description = "Diagrams backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "aivika-transformers" = callPackage @@ -18945,6 +19071,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "alarmclock" = callPackage @@ -19299,6 +19426,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -19318,6 +19446,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "alsa-midi" = callPackage @@ -19354,6 +19483,7 @@ self: { homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -19374,6 +19504,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -19409,6 +19540,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -19556,8 +19688,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.1.0"; - sha256 = "60a65271453aedff93b9789e52f258ea6b6fe315a26f361710a50a825167a2c3"; + version = "1.3.0"; + sha256 = "1396df4f5a92f854d5fa9562d9ec7c23fc26f0aa7e2f89e0c4e7818dd814a4a3"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-client http-conduit ini lens mmorph monad-control @@ -19576,19 +19708,17 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.1.0"; - sha256 = "0ed84582688b21076214a24ba5d31a3f25f3ee7765ed0c18d44fe0459d4101ca"; + version = "1.3.0"; + sha256 = "18f6878a5213874ab4107ed5298a0cf16ccfcb92ef85a44f81c9ffb1d9c5c259"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudformation" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19596,19 +19726,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.1.0"; - sha256 = "70d06d56987589915ac6011badf3c1f5d336814f99c09cd99424f3af312b9bf2"; + version = "1.3.0"; + sha256 = "d3f840b0d4f531dea89d3f7541033e3595137c015c3ce7ac2816c06dc4571ce2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudfront" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19616,19 +19744,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.1.0"; - sha256 = "c931a4e78ffa1e81023dc1b306c4f2195be09b0246ef7b8022311421ef78c01c"; + version = "1.3.0"; + sha256 = "19b545ff60c0bcf39f42619304339f71b32e1794819aaab68bbec8ad52cb51ed"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudhsm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19636,19 +19762,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.1.0"; - sha256 = "b9f6ad65225dfd1eb0560a2a71a52991560ef4e69654b0053f37414c22080875"; + version = "1.3.0"; + sha256 = "59eb2b4b696b3ace313ffff5b1f3317db90b2e846918637a604a03d11726a164"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudsearch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19656,19 +19780,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.1.0"; - sha256 = "3e22407422a823f86eeff6685ccc71a4b775ed8962522d70ec49092f09c8b8ae"; + version = "1.3.0"; + sha256 = "04075d1db69664aece947b4b69138d24074ee3dcd8c57e924525690bcffba76b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudsearch-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19676,19 +19798,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.1.0"; - sha256 = "8f6f6ce4ce0194d0f51c6b9ed9a71a0e270c5385a4c3dd63589c6d66cfdf6872"; + version = "1.3.0"; + sha256 = "4f6add8d97e4e97f8c855a0b82f1bd2e45098456123e9b477c7fc6dce354d8e2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudtrail" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19696,19 +19816,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.1.0"; - sha256 = "a10e4dfbbef7058f8e21c5afb3f3b8108880c26bf163b8cfb048fa91ef47a4ea"; + version = "1.3.0"; + sha256 = "7cfe2b4bcc35b692288c964536f3a9c38a474177e9c3b4cc6e9b6eb9a8d46ce0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudwatch" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19716,19 +19834,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.1.0"; - sha256 = "6f9d2ac648899c775daeac0ed2a80e83c16876497762b8a99afc600e6f4546e9"; + version = "1.3.0"; + sha256 = "eddbb9e72543ba8fc3fe0a515cf57089c33005c317c305245807d52caa0ae566"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cloudwatch-logs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19736,19 +19852,17 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.1.0"; - sha256 = "8c3c9553f43f1312881f22da35a34ad404101f3b790d2734590abd4ce5dbcfb7"; + version = "1.3.0"; + sha256 = "7a8245c5983d9353b31d8f6668942dcdad7cbafe04561049156eb2b6bfebdfc5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codecommit" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19756,19 +19870,17 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.1.0"; - sha256 = "abe54fee07ff52883343780cade09238da0e41d23ecc95fa9c1e3f9a8743b78a"; + version = "1.3.0"; + sha256 = "a20b5fb61cbcbd22555141ae21266e8f1b30eb55987f8853319ec6d464628de6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codedeploy" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19776,19 +19888,17 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.1.0"; - sha256 = "0b5832f433693ea1238a0391c19765d975b24425c378ae6688ba358849ed758c"; + version = "1.3.0"; + sha256 = "c3bb7de0e15bc3f0b06d159708e3e73aca0a83727d1668c6eeb38b20db0e08ac"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-codepipeline" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19796,19 +19906,17 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.1.0"; - sha256 = "8b892d604355caea388c8680712b8e03cee1fd85c9275cb118009cbf4f1ee7e0"; + version = "1.3.0"; + sha256 = "eee08157eddf6ed82637650a70ab8e47021f9a1756b2d9d16ceeeb9104284030"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cognito-identity" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19816,19 +19924,17 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.1.0"; - sha256 = "a154b6645d58211b3ebeb9407a4683ae85f6a1069d9c4027da664a34b471910e"; + version = "1.3.0"; + sha256 = "0ca43b39cdeaaa2554ffb00aea346ef837bb044ff3280a2dee716457f872fe4e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-cognito-sync" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19836,19 +19942,17 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.1.0"; - sha256 = "0a831859befa66f52636384f3e70217e0a804d9267135010034bc047ba2c5f75"; + version = "1.3.0"; + sha256 = "fd3682f6f6720c1a654e9a19fe0927b151f93c31f3d320ea2041c6dae907186b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-config" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19856,19 +19960,17 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.1.0"; - sha256 = "960c9381c50aa26bcf5bb05704ede000ef9614488ea9f428f7d1ae6eba7c886b"; + version = "1.3.0"; + sha256 = "11585855c88930182d6cffe4ad169426a4f257f04946b143491e15fc39bc7bea"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring @@ -19881,8 +19983,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.1.0"; - sha256 = "fe4b3185f61ad56e3dfddcd5050d3cfa41a997fd3c5b74ec8ed24404dada2cb6"; + version = "1.3.0"; + sha256 = "f8d093aff4bf2226337f997c875cce964d21796782f7643108404c7967899ab4"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite exceptions hashable http-client @@ -19906,19 +20008,17 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.1.0"; - sha256 = "8c72a767f8b3546dd0e895035edfcc3a6e0fe060a2398e973938addfca7b4ce5"; + version = "1.3.0"; + sha256 = "8590782df1c3c2a72a3e431caaea66e7c56050766fcd390927ba8568cb3f7155"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-devicefarm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19926,19 +20026,17 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.1.0"; - sha256 = "3c99376995534299985d2163d8cf55938d925f08c3e214b5f3567a26f4515ab1"; + version = "1.3.0"; + sha256 = "4d089812ba01148f2b27c11c5d961ba0a6b47d73fbdaab09cbf30463896d3a89"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-directconnect" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19946,19 +20044,17 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.1.0"; - sha256 = "5ec6240b4fe226859b51e325f44f566c21a93ff91d628b6d9eafeb823152e74b"; + version = "1.3.0"; + sha256 = "1447a87d6c3c1b3fb4572a0c1f1d6f682a1e4f70f3f4526f9ecb81f3c5207ed0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19966,19 +20062,17 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.1.0"; - sha256 = "19de365fedf51d8da57c5099e04e6d827b3c3b4b3f9aacc7e78d7bf7a9def542"; + version = "1.3.0"; + sha256 = "8444861b5673d169a4f714a6c12a63773100c8d2aa2c7ea0e65654c2de7b76a6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-dynamodb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -19986,19 +20080,17 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.1.0"; - sha256 = "b4cc74ff79ab032a06cbf7245db1d8734cf9946625a9bf00fe4974dcb8628f45"; + version = "1.3.0"; + sha256 = "1696f6c0957c26a5c928111abb8310fef9ea56b133e248abdffd52ef8b8b3124"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-dynamodb-streams" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20006,19 +20098,17 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.1.0"; - sha256 = "04e4eb5b332a455d4ac40824a60a07b47c8bc73aa89d82ce85bb944b0f2cde11"; + version = "1.3.0"; + sha256 = "edb698acb00e9f7dec593929cca51ae0365000fae05ae066a1d57a762f4782f4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ec2" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20026,19 +20116,18 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.1.0"; - sha256 = "c715cd05ee79755de37df834d5315041c5d582004720d7e3b18c2fa2ff28deb7"; + version = "1.3.0"; + sha256 = "f687259e080587cea9f154d73d076f87b3662d3299d54baa74fcc127cc454f61"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; "amazonka-ecs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20046,19 +20135,17 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.1.0"; - sha256 = "82eb9b0a963885a6c2d846e2497cf39519c8f6a07315a6cb8d07cd88246376d6"; + version = "1.3.0"; + sha256 = "094ee4d8663efa67edca4b63a771463322c5acd69605c7997a3422b43a549dc6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-efs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20066,19 +20153,17 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.1.0"; - sha256 = "daf42240c49d66cbc715bcc2cace1f430e81b3cc78ce0e2455475f9706e4ae42"; + version = "1.3.0"; + sha256 = "d84613773c2a887ec19651c81221db4f3265f3abe12a06630a100ee5887dc461"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elasticache" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20086,19 +20171,17 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.1.0"; - sha256 = "edc2f2e5a67c1b409b93b60862dd7b1303201d2b59b3e19931e8bde9a948e277"; + version = "1.3.0"; + sha256 = "c44618aaf4e1306ece40ace9843094621a6577b9f24f4f51b20195620857f337"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elasticbeanstalk" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20106,19 +20189,17 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.1.0"; - sha256 = "d45f9ebdda89b89f461948438e1c2d0e4eb1e7a0ab2fed229203fc29d027ed35"; + version = "1.3.0"; + sha256 = "e53ba795b1456aea3d65eb6dfa3db6d072a59c23355167ab56d70253038a950d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elastictranscoder" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20126,19 +20207,17 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.1.0"; - sha256 = "f5ea457def994de22b4bc8c471ecf2355c4acf80d44c022e34d92ffdd8606500"; + version = "1.3.0"; + sha256 = "c0365de5873cb3d8603048a482fef27227b73ecf5fe20720d9faea0e857a4a06"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-elb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20146,19 +20225,17 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.1.0"; - sha256 = "2f3e4a8971545bf39bedf5a75854c21733a797598318e076f2a468d8f5647a96"; + version = "1.3.0"; + sha256 = "88bd2cd08ee1b8cf2f36df53ef5ef50db074e4294195d0c251981b028346fd0c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-emr" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20166,19 +20243,17 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.1.0"; - sha256 = "29f4c25ff4cdcd83809afa9fdc5e70a8bf89c6b1e4bcdfc7367faade023566bc"; + version = "1.3.0"; + sha256 = "423304b57c509be55017c0f1f957c6a423c5e7631cbd4106ef375248dab69702"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-glacier" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20186,19 +20261,17 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.1.0"; - sha256 = "61f954b805f51ca436a01f42e9068674540c3828b269e6c1547aedd976516b91"; + version = "1.3.0"; + sha256 = "e1a5298bb692f336dae054f38507298e7d6943a98b5bbdbea3b1c64c71f77d8b"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-iam" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20206,19 +20279,17 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.1.0"; - sha256 = "9b52ae4b69126b24be8e7dac78aab91c7b14b0ab1c162fe2e8b8e831f5e41991"; + version = "1.3.0"; + sha256 = "e4e2ce1d0a13ff1a69ee292a6be8560d8037e56359dbbc74b8972de8b6895a6d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-importexport" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20226,19 +20297,17 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.1.0"; - sha256 = "7682771e6a51a96a69c8a5c8176b33a944b598d84a353884287b8b3183b2a5a9"; + version = "1.3.0"; + sha256 = "0915509dceaec445062900d2ceb6677558cb6bc6ad1de5512c41925849587df3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-kinesis" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20246,19 +20315,17 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.1.0"; - sha256 = "0103f032d0ebbd562a7e510897cb50f5bed8383fbbc7ac7868564ab57fa7a0e7"; + version = "1.3.0"; + sha256 = "4f241b76393553ac61604a14f734ba5b7060ef170001e1585f8c795cba7adc8c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-kms" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20266,19 +20333,17 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.1.0"; - sha256 = "0c9f0d02cc5fdf1ef64b0446d82718277c3570f761b0644504ee90d842f78b9a"; + version = "1.3.0"; + sha256 = "658305fdd8ae3c310b75fdd7ec79706e92327c67ae6880dceb242e0ea6a2b773"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-lambda" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20286,19 +20351,17 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.1.0"; - sha256 = "07d43e6d4585a09139006708e831c7e713c1b33dbc711cc08fd6c723ace589f3"; + version = "1.3.0"; + sha256 = "de13741402358d3442934368c6bdeae46a0d6da96987983f0eecbf5fae0317c4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ml" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20306,19 +20369,17 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.1.0"; - sha256 = "ef09c86c1ccf257d4dd53627a75213015482e2ce18d1c5a85b4017bb215563dc"; + version = "1.3.0"; + sha256 = "6b25d8df0cb3ccb27602dbb36279bfde43b0377cac0111bde157aaab708e0519"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-opsworks" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20326,19 +20387,17 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.1.0"; - sha256 = "9ac85226c177d59135f7fde294202951b5415e9a0afbe1b7a2b2c7f57f2531c0"; + version = "1.3.0"; + sha256 = "22cf650032fedf956e34b548e7e81ee02c9c8dc43b5f46c395e6b6a1474ab037"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-rds" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20346,19 +20405,18 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.1.0"; - sha256 = "8081408044b167cde41e466073d4acd8e4732b2586c0fa637a5a323e84447b02"; + version = "1.3.0"; + sha256 = "b06a847c3cef8d5335e699a7d3d6b52206aa04aca9437bbfb111d3574ab21c18"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; "amazonka-redshift" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20366,19 +20424,17 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.1.0"; - sha256 = "688e017fd663b915a80d37954bd3b48deccc5d9e90b18770ff91af46ddd9c01b"; + version = "1.3.0"; + sha256 = "999b613233bf1971950628e6d0273073783187f2f93222ccff9baffef87691d6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-route53" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20386,19 +20442,17 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.1.0"; - sha256 = "dde78c3ff32eb00e3342d89426ec9f6792e3ecb40af378525e74141b415c0436"; + version = "1.3.0"; + sha256 = "098eba1804f24b374a5b5cf5d0fdeb69d4c5733ca2ce892d7d01575a27adf9c6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-route53-domains" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20406,19 +20460,17 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.1.0"; - sha256 = "cc4e138341b187146ac10d52430abebcf1780846ace4482d838b3f1053abb9b2"; + version = "1.3.0"; + sha256 = "bd00978c2fc6b53403d06194a41f82c527929b4fd7c25d2e86adabcee791089d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-s3" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20426,19 +20478,18 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.1.0"; - sha256 = "7cdb79c15c0f1152e40a464d7fd1cc6edf1526d40ca1e7f8d33d0968acdc6e71"; + version = "1.3.0"; + sha256 = "7245d983beb418a9c06f48a159d32caccb866bbc10502c3095e0374f9a517616"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; "amazonka-sdb" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20446,19 +20497,17 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.1.0"; - sha256 = "fe6b9a82edc028b2895e14a5ed2f4d4efdd6c13328a87d18c1215fc2baa35cb7"; + version = "1.3.0"; + sha256 = "83e1fd3234d1a936cf1b23a67925ce132c47a8e7e66b7c7c339b4118379a0a49"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-ses" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20466,19 +20515,17 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.1.0"; - sha256 = "39b2031ca579c11992f093c9c6915133e4b182105434adb44823f3d0a56aeafd"; + version = "1.3.0"; + sha256 = "3ca9102b7b91c3867ba70724f789ac3dda1d2c9b47e36e95ac5bebbb0ee7c05d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sns" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20486,19 +20533,17 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.1.0"; - sha256 = "be2609584bb6e0af18af5b3a25c1281a0f665d993d8b8c14b310aba56287a3cf"; + version = "1.3.0"; + sha256 = "520d7258ae543e8cc847187be1b767aaf8d101c075b0e84407baf11bc838bba4"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sqs" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20506,19 +20551,18 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.1.0"; - sha256 = "9bfb0cf6d07f1019bcfeeb4169c0a6dd6147e1eb9132b04f4cf256bbc8b7bcfd"; + version = "1.3.0"; + sha256 = "db765483114452f6f479b790d2ad18426781fa9c440539f96c67feb6ff3e228e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; "amazonka-ssm" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20526,19 +20570,17 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.1.0"; - sha256 = "3be89223c0c1110778bfeb32aeb3ed0b4fcdf85aedfce8c0a67ece34f1619f18"; + version = "1.3.0"; + sha256 = "08a14a8bf072bb807e0dd03f7db7738dc0606064f5c9db4a62f8c9da6cddaae8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-storagegateway" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20546,19 +20588,17 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.1.0"; - sha256 = "d3a8cd4205254d65e482ed96114cb98d233deb26d25a04a5f45b82dab01a6e0a"; + version = "1.3.0"; + sha256 = "5b1cb452a4d751700e4220e7ca36823cd99b0c96b90d25dd738ce5736662deca"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-sts" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20566,19 +20606,17 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.1.0"; - sha256 = "566b295c705d94a91f479f82414cd3487e8e5872e1287d45d0d686670c024fb5"; + version = "1.3.0"; + sha256 = "86ba866f2afb5a462b0d61da9692744bbe43fe066094cae8507801aaea0560d9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-support" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20586,19 +20624,17 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.1.0"; - sha256 = "fd16936656d8d49b35c965945a886659c3f996fd4234843dfba7fb15152eb58f"; + version = "1.3.0"; + sha256 = "ff272967d112bd6886cc83f1af4df1b60be2ed416a235af76814c6d67d53c725"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "amazonka-swf" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20606,19 +20642,40 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.1.0"; - sha256 = "85184fd03d9e0181f7f2ba7b4c1ad14b2ce46235fc5814659e3bee8e5437d323"; + version = "1.3.0"; + sha256 = "9e2bae7e0ff131f013746032118ee8e6ac0dd7fdca011ab1ad24ff294e423076"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; + + "amazonka-test" = callPackage + ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring + , case-insensitive, conduit, conduit-extra, groom, http-client + , http-types, lens, process, resourcet, tasty, tasty-hunit + , template-haskell, temporary, text, time, unordered-containers + , yaml + }: + mkDerivation { + pname = "amazonka-test"; + version = "1.3.0"; + sha256 = "fe906b399eff538ddbd44e31eada4407c2d9945d7fbd3bc3372dabda76df523e"; + libraryHaskellDepends = [ + aeson amazonka-core base bifunctors bytestring case-insensitive + conduit conduit-extra groom http-client http-types lens process + resourcet tasty tasty-hunit template-haskell temporary text time + unordered-containers yaml + ]; + homepage = "https://github.com/brendanhay/amazonka"; + description = "Common functionality for Amazonka library test-suites"; + license = "unknown"; + }) {}; "amazonka-workspaces" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring @@ -20626,19 +20683,17 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.1.0"; - sha256 = "0e7b0cc339022a304245f054d04e153671eaff927ad1e13c0f632bad7746ac56"; + version = "1.3.0"; + sha256 = "485a812a315951d0e8b71ca7d156d4f14544096f852180507e59e8811feada96"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = "unknown"; - broken = true; - }) {amazonka-test = null;}; + }) {}; "ampersand" = callPackage ({ mkDerivation, base, bytestring, containers, csv, directory @@ -20903,8 +20958,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "annotated-wl-pprint"; - version = "0.6.0"; - sha256 = "3d29f11396fb0675fff25254a9f4354aa763a659fa10a48829d15fed087792e7"; + version = "0.7.0"; + sha256 = "0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; description = "The Wadler/Leijen Pretty Printer, with annotation support"; @@ -21234,6 +21289,7 @@ self: { aeson base bytestring Cabal containers hspec http-client text transformers ]; + jailbreak = true; homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -21305,8 +21361,8 @@ self: { }: mkDerivation { pname = "apiary"; - version = "1.4.4"; - sha256 = "de395821116717cf654f52176e6487782522f567b288a17bab7713ff85411085"; + version = "1.4.5"; + sha256 = "6c6f898924b6209f33ef81bc0e2c7ceb166fc04825a8ffb4d6c5732f41429313"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring bytestring-read case-insensitive data-default-class exceptions @@ -21616,12 +21672,9 @@ self: { ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "app-lens"; - version = "0.1.0.0"; - sha256 = "280cfa13e1f52d40fa10f70f5f98e13e7de9633fa8919a9dcfef857e98953f3e"; - revision = "2"; - editedCabalFile = "29d9e8cabf54f27b1ccf007530fe698c0895c0bb6a2a6da50b71fafd4c27bd6d"; + version = "0.1.0.1"; + sha256 = "717cb2d1abc9add860d6e058b2da8ba45a124f8a637b4ab5984a89a42d485627"; libraryHaskellDepends = [ base containers lens mtl ]; - jailbreak = true; homepage = "https://bitbucket.org/kztk/app-lens"; description = "applicative (functional) bidirectional programming beyond composition chains"; license = stdenv.lib.licenses.bsd3; @@ -22190,6 +22243,7 @@ self: { ]; description = "Natural number arithmetic"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "arithmoi" = callPackage @@ -22249,6 +22303,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Mutable and immutable arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "array-forth" = callPackage @@ -22586,15 +22641,12 @@ self: { ({ mkDerivation, base, bytestring, cereal, mtl, text }: mkDerivation { pname = "asn1-data"; - version = "0.7.1"; - sha256 = "f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783"; - revision = "1"; - editedCabalFile = "6c8f01076a88b9ea0f2ce9b5fa2b09dc658332bd4dedfbc8d6e7fae25ea5ed1f"; + version = "0.7.2"; + sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal mtl text ]; - jailbreak = true; - homepage = "http://github.com/vincenthz/hs-asn1-data"; + homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22606,8 +22658,8 @@ self: { }: mkDerivation { pname = "asn1-encoding"; - version = "0.9.0"; - sha256 = "17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b"; + version = "0.9.2"; + sha256 = "786e6bdd6caf35807339c6c5770a3ef76a2c7cc4ff8eaea43567d9b539206f21"; libraryHaskellDepends = [ asn1-types base bytestring hourglass mtl ]; @@ -23106,6 +23158,7 @@ self: { homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "An atomic counter implemented using the FFI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "atomic-primops-vector" = callPackage @@ -24396,27 +24449,27 @@ self: { }) {}; "b9" = callPackage - ({ mkDerivation, aeson, async, base, bifunctors, binary, bytestring - , conduit, conduit-extra, ConfigFile, directory, filepath, free - , hspec, hspec-expectations, mtl, optparse-applicative, parsec - , pretty, pretty-show, process, QuickCheck, random, semigroups, syb - , template, text, time, transformers, unordered-containers, vector - , yaml + ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes + , bytestring, conduit, conduit-extra, ConfigFile, directory + , filepath, free, hspec, hspec-expectations, mtl + , optparse-applicative, parsec, pretty, pretty-show, process + , QuickCheck, random, semigroups, syb, template, text, time + , transformers, unordered-containers, vector, yaml }: mkDerivation { pname = "b9"; - version = "0.5.8"; - sha256 = "71c30f016937045d4400b835f97e94913e929fa5d130a1fe2cc5ece4eb930f65"; + version = "0.5.10"; + sha256 = "df1b11037ace168568c378259b59f6d9a6ccc81ac339389237e825349ee6edb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bifunctors binary bytestring conduit conduit-extra - ConfigFile directory filepath free mtl parsec pretty pretty-show - process QuickCheck random semigroups syb template text time - transformers unordered-containers vector yaml + aeson async base bifunctors binary boxes bytestring conduit + conduit-extra ConfigFile directory filepath free mtl parsec pretty + pretty-show process QuickCheck random semigroups syb template text + time transformers unordered-containers vector yaml ]; executableHaskellDepends = [ - base bytestring optparse-applicative + base bytestring directory optparse-applicative ]; testHaskellDepends = [ aeson base bytestring hspec hspec-expectations QuickCheck @@ -24440,6 +24493,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "backdropper" = callPackage @@ -24700,6 +24754,7 @@ self: { homepage = "http://blog.malde.org/posts/bamstats.html"; description = "A program to extract various information from BAM alignmnet files"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bank-holidays-england" = callPackage @@ -24762,7 +24817,6 @@ self: { jailbreak = true; description = "Generate Code 128 barcodes as PDFs"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barecheck" = callPackage @@ -24858,6 +24912,7 @@ self: { libraryHaskellDepends = [ ghc-prim rts ]; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-compat" = callPackage @@ -24972,6 +25027,7 @@ self: { homepage = "https://github.com/pxqr/base32-bytestring"; description = "Fast base32 and base32hex codec for ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "base32string" = callPackage @@ -25961,6 +26017,7 @@ self: { homepage = "https://github.com/kolmodin/binary"; description = "Binary serialisation for Haskell values using lazy ByteStrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-bits" = callPackage @@ -26098,6 +26155,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-orphans" = callPackage + ({ mkDerivation, aeson, base, binary, hashable + , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck + , text, text-binary, time, unordered-containers, vector + , vector-binary-instances + }: + mkDerivation { + pname = "binary-orphans"; + version = "0.1.1.0"; + sha256 = "a34b6ea3a5485859c3d83aa6d1e4535e05590ef543d01482beba757db1d14431"; + libraryHaskellDepends = [ + aeson base binary hashable scientific tagged text text-binary time + unordered-containers vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson base binary hashable quickcheck-instances scientific tagged + tasty tasty-quickcheck text time unordered-containers vector + ]; + homepage = "https://github.com/phadej/binary-orphans#readme"; + description = "Orphan instances for binary"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, mtl }: mkDerivation { @@ -26222,6 +26302,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "binary-tagged" = callPackage + ({ mkDerivation, aeson, array, base, bifunctors, binary + , binary-orphans, bytestring, containers, generics-sop, hashable + , quickcheck-instances, scientific, SHA, tagged, tasty + , tasty-quickcheck, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "binary-tagged"; + version = "0.1.0.0"; + sha256 = "39c1141facd205fff86f5dde86623c6c2649f75fbc80be9e43b2b0ee89f8ef43"; + libraryHaskellDepends = [ + aeson array base binary bytestring containers generics-sop hashable + scientific SHA tagged text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson array base bifunctors binary binary-orphans bytestring + containers generics-sop hashable quickcheck-instances scientific + SHA tagged tasty tasty-quickcheck text time unordered-containers + vector + ]; + homepage = "https://github.com/phadej/binary-tagged#readme"; + description = "Tagged binary serialisation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-typed" = callPackage ({ mkDerivation, base, binary, bytestring, murmur-hash, tasty , tasty-hunit, tasty-quickcheck @@ -26314,6 +26419,7 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings" = callPackage @@ -26370,6 +26476,7 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; @@ -26525,6 +26632,7 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -26660,6 +26768,7 @@ self: { homepage = "https://github.com/relrod/hamlib-haskell"; description = "Hamlib bindings for Haskell"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hamlib;}; "bindings-hdf5" = callPackage @@ -26685,6 +26794,7 @@ self: { homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) blas; lapack = null;}; "bindings-libcddb" = callPackage @@ -26821,6 +26931,7 @@ self: { homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -26875,6 +26986,7 @@ self: { libraryHaskellDepends = [ base bindings-DSL ]; description = "parport bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bindings-portaudio" = callPackage @@ -26956,6 +27068,7 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage @@ -27081,6 +27194,7 @@ self: { homepage = "http://code.mathr.co.uk/binembed"; description = "Example project using binembed to embed data in object files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bio" = callPackage @@ -27298,6 +27412,7 @@ self: { homepage = "https://github.com/acfoltzer/bit-vector"; description = "Simple bit vectors for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "bitarray" = callPackage @@ -27499,6 +27614,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for Data.Bitmap."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bitmaps" = callPackage @@ -27572,6 +27688,7 @@ self: { librarySystemDepends = [ gcc_s ]; description = "Efficient high-level bit operations not found in Data.Bits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {gcc_s = null;}; "bitset" = callPackage @@ -27718,15 +27835,15 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.5.0.0"; - sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9"; + version = "0.5.0.1"; + sha256 = "24a29bdc360b4121c7992cf4118ed1caa32854d80aa2b2d3a63a63d5a0f9e38f"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types microlens microlens-th network scientific split text time ]; testHaskellDepends = [ - aeson base bytestring directory doctest hspec microlens safe text - time + aeson base bytestring directory doctest hspec http-conduit + http-types microlens safe text time ]; homepage = "https://github.com/tebello-thejane/bitx-haskell"; description = "A Haskell library for working with the BitX bitcoin exchange"; @@ -27836,6 +27953,7 @@ self: { homepage = "https://github.com/bitemyapp/blacktip"; description = "Decentralized, k-ordered unique ID generator"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "blakesum" = callPackage @@ -28044,6 +28162,7 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -28133,11 +28252,24 @@ self: { base blaze-builder bytestring containers HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-shields" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg }: + mkDerivation { + pname = "blaze-shields"; + version = "0.1.0.1"; + sha256 = "07e9297f3b261aaecc3c7e5c9a1f2f99fe5cbcd1e8d1f5a10e95e2a87f213fe2"; + libraryHaskellDepends = [ base blaze-html blaze-markup blaze-svg ]; + homepage = "http://githubcom/Qinka/blaze-shields"; + description = "create svg by Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-svg" = callPackage ({ mkDerivation, base, blaze-markup, mtl }: mkDerivation { @@ -28344,6 +28476,7 @@ self: { executableHaskellDepends = [ base GLFW OpenGL ]; description = "OpenGL Logic Game"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber" = callPackage @@ -28362,6 +28495,7 @@ self: { homepage = "https://secure.plaimi.net/games/blubber.html"; description = "The blubber client; connects to the blubber server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "blubber-server" = callPackage @@ -28521,6 +28655,7 @@ self: { version = "0.1.0.0"; sha256 = "774f3f3313a8909505834e647b744fa53178b6a4eee5cf55b5207da5e6d7217b"; libraryHaskellDepends = [ base bytestring HUnit ]; + jailbreak = true; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; license = stdenv.lib.licenses.gpl3; @@ -29155,6 +29290,7 @@ self: { homepage = "https://github.com/chadaustin/buffer-builder"; description = "Library for efficiently building up buffers, one piece at a time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "buffer-builder-aeson" = callPackage @@ -29179,6 +29315,7 @@ self: { jailbreak = true; description = "Serialize Aeson values with Data.BufferBuilder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "bugzilla" = callPackage @@ -29312,6 +29449,8 @@ self: { pname = "bumper"; version = "0.6.0.3"; sha256 = "7cfce3a38be30744a2eb322ad1e5271cd665fa62b4fe21bdf9aa00fcdbc4daa8"; + revision = "1"; + editedCabalFile = "d5083fd8bd41bdd8a9afb459891d3fbfd674b5279b30993928690410808a2af0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29431,6 +29570,7 @@ self: { homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "bv" = callPackage @@ -29466,7 +29606,6 @@ self: { homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytable" = callPackage @@ -29568,6 +29707,7 @@ self: { homepage = "https://github.com/haskell/bytestring"; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-arbitrary" = callPackage @@ -29683,6 +29823,7 @@ self: { base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; @@ -29730,12 +29871,11 @@ self: { ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hashable }: mkDerivation { pname = "bytestring-plain"; - version = "0.1.0.1"; - sha256 = "ca1486fa8d445474bca1660d7ff4319725be0054981b378a128e1db9fd4cee14"; + version = "0.1.0.2"; + sha256 = "9e2dfbba5b90c6b121953f8a18afbab4041c5a26b8af350360ec888a6ce6fddd"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim hashable ]; - jailbreak = true; homepage = "https://github.com/hvr/bytestring-plain"; description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)"; license = stdenv.lib.licenses.bsd3; @@ -29995,6 +30135,7 @@ self: { homepage = "https://github.com/haskell/c2hs"; description = "C->Haskell FFI tool that gives some cross-language type safety"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "c2hsc" = callPackage @@ -30175,6 +30316,7 @@ self: { homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -30322,6 +30464,33 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-helper_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, ghc-prim, mtl, process, template-haskell, temporary + , transformers, unix, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.6.0.0"; + sha256 = "5baad0b239fce05bf61fc576afe6db3ba67bed312c7163e98a143a70c6af222c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal directory filepath ghc-prim mtl process transformers + ]; + executableHaskellDepends = [ + base bytestring Cabal directory filepath ghc-prim process + template-haskell temporary transformers utf8-string + ]; + testHaskellDepends = [ + base bytestring Cabal directory extra filepath ghc-prim mtl process + template-haskell temporary transformers unix utf8-string + ]; + description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-install_1_18_1_0" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , directory, filepath, HTTP, HUnit, mtl, network, network-uri @@ -30355,6 +30524,8 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "cabal-install" = callPackage @@ -30388,6 +30559,7 @@ self: { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "cabal-install-bundle" = callPackage @@ -30589,8 +30761,8 @@ self: { }: mkDerivation { pname = "cabal-rpm"; - version = "0.9.6"; - sha256 = "e501a7b3a203be2e069e26337e6bbdd0993ffe6d9e75a626089b2637393d2f1e"; + version = "0.9.7"; + sha256 = "b927e84b5a23edffa8053c3c5e5a5191c434dbcbbe7e4551f8dc840d3b17bc74"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -30652,15 +30824,14 @@ self: { }: mkDerivation { pname = "cabal-sort"; - version = "0.0.5.1"; - sha256 = "2410da39c8a70a47727c2d131c34c51372840041fed7cb51b54fed8dae9921a5"; + version = "0.0.5.2"; + sha256 = "9a12f7db6ec6c34ba80aa903ab5dca4be52c76799c7b14ac8d18c181d194a60e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring Cabal containers directory explicit-exception fgl filepath process transformers utility-ht ]; - jailbreak = true; description = "Topologically sort cabal packages"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30865,6 +31036,7 @@ self: { homepage = "http://github.com/NixOS/cabal2nix"; description = "Convert Cabal files into Nix build instructions"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "cabal2spec" = callPackage @@ -31537,6 +31709,7 @@ self: { base containers HUnit linear sdl2 test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; + jailbreak = true; homepage = "https://github.com/Noeda/caramia/"; description = "High-level OpenGL bindings"; license = stdenv.lib.licenses.mit; @@ -31758,6 +31931,7 @@ self: { testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text ]; + jailbreak = true; homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; license = stdenv.lib.licenses.bsd3; @@ -31773,6 +31947,7 @@ self: { homepage = "https://github.com/jb55/cased"; description = "Track string casing in its type"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; "cases" = callPackage @@ -31861,8 +32036,8 @@ self: { }: mkDerivation { pname = "cassava"; - version = "0.4.3.1"; - sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac"; + version = "0.4.4.0"; + sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f"; libraryHaskellDepends = [ array attoparsec base blaze-builder bytestring containers deepseq hashable text unordered-containers vector @@ -32251,6 +32426,7 @@ self: { jailbreak = true; description = "Cairo-based CellRenderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cereal" = callPackage @@ -32401,10 +32577,8 @@ self: { }: mkDerivation { pname = "cf"; - version = "0.4.1"; - sha256 = "1d3bd0bab9a927e0efd386e8786ad7e0936921553edf275e7d2b676b40c310fd"; - revision = "1"; - editedCabalFile = "9fd574edfce6ea014201ccc3591638de0574f251290bcf0f44a8a00338131692"; + version = "0.4.2"; + sha256 = "f2852d1f13c434f5e49ed319afc8f1a79cbb5e06d4235e5b342dc44cba6c2519"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -32491,6 +32665,7 @@ self: { ]; description = "Parser for categorial grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "cgen" = callPackage @@ -32560,19 +32735,19 @@ self: { "cgrep" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, bytestring , cmdargs, containers, directory, dlist, either, filepath, ghc-prim - , mtl, regex-posix, safe, split, stm, stringsearch, unix-compat - , unordered-containers + , mtl, regex-posix, safe, split, stm, stringsearch, transformers + , unix-compat, unordered-containers }: mkDerivation { pname = "cgrep"; - version = "6.5.3"; - sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e"; + version = "6.5.4"; + sha256 = "2dd9112da6cde89934d8a65a93597b161928c23c01b1af25ffae72ee104c768a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal array async base bytestring cmdargs containers directory dlist either filepath ghc-prim mtl regex-posix safe split - stm stringsearch unix-compat unordered-containers + stm stringsearch transformers unix-compat unordered-containers ]; homepage = "http://awgn.github.io/cgrep/"; description = "Command line tool"; @@ -32743,6 +32918,7 @@ self: { homepage = "http://github.com/Aelve/charsetdetect-ae"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "chart-histogram" = callPackage @@ -32959,9 +33135,11 @@ self: { version = "0.2.1"; sha256 = "00f423ea3ef78f24ba2d9077db267fa9d30e47fa1b80ebafcaf2d5879214d400"; libraryHaskellDepends = [ base chell HUnit ]; + jailbreak = true; homepage = "https://john-millikin.com/software/chell/"; description = "HUnit support for the Chell testing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chell-quickcheck" = callPackage @@ -33102,7 +33280,6 @@ self: { jailbreak = true; description = "measure timings of data evaluation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chu2" = callPackage @@ -33492,6 +33669,7 @@ self: { homepage = "http://github.com/thoughtpolice/hs-cityhash"; description = "Bindings to CityHash"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cjk" = callPackage @@ -33536,28 +33714,29 @@ self: { ({ mkDerivation, aeson, array, base, bytestring, cmdargs , containers, data-stringmap, directory, doctest, executable-path , filepath, HTTP, HUnit, json-builder, lens, lens-aeson, mtl - , network, network-uri, parsec, process, QuickCheck, split - , string-conversions, tasty, tasty-hunit, tasty-th, text - , transformers + , mtl-compat, network, network-uri, parsec, process, QuickCheck + , split, string-conversions, tasty, tasty-hunit, tasty-th, text + , transformers, transformers-compat }: mkDerivation { pname = "clafer"; - version = "0.4.0"; - sha256 = "f6a58d2a75cb3ff32cad28f7704922bcc596b5ed864e69324cc79cdb38ded2f6"; + version = "0.4.1"; + sha256 = "e3015519a90073e986ed67ba753384b536d9d02652c34aa1195adb6f7e12c0d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array base bytestring cmdargs containers data-stringmap directory executable-path filepath HTTP json-builder lens - lens-aeson mtl network network-uri parsec process split - string-conversions text transformers + lens-aeson mtl mtl-compat network network-uri parsec process split + string-conversions text transformers transformers-compat ]; executableHaskellDepends = [ base cmdargs containers filepath mtl process split ]; testHaskellDepends = [ base containers data-stringmap directory doctest filepath HUnit - lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th + lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit + tasty-th transformers-compat ]; homepage = "http://clafer.org"; description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot"; @@ -33568,29 +33747,31 @@ self: { "claferIG" = callPackage ({ mkDerivation, array, base, clafer, cmdargs, containers , data-stringmap, directory, executable-path, filepath, haskeline - , HaXml, HUnit, json-builder, mtl, parsec, process + , HaXml, HUnit, json-builder, mtl, mtl-compat, parsec, process , string-conversions, tasty, tasty-hunit, tasty-th, transformers + , transformers-compat }: mkDerivation { pname = "claferIG"; - version = "0.4.0"; - sha256 = "dca649803fdbe55b282bb2dd033253cc543d6d59615276b120a1f1f061ad3406"; + version = "0.4.1"; + sha256 = "e804d364884837730b91c46f9dcfa8b39ea7438e9bbd3a810676ba635b6caf33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base clafer containers data-stringmap directory - executable-path filepath haskeline HaXml json-builder mtl parsec - process string-conversions transformers + executable-path filepath haskeline HaXml json-builder mtl + mtl-compat parsec process string-conversions transformers + transformers-compat ]; executableHaskellDepends = [ base clafer cmdargs containers directory executable-path filepath - haskeline mtl transformers + haskeline mtl mtl-compat transformers transformers-compat ]; testHaskellDepends = [ array base clafer cmdargs directory filepath HUnit tasty - tasty-hunit tasty-th transformers + tasty-hunit tasty-th transformers transformers-compat ]; - homepage = "https://github.com/gsdlab/claferIG"; + homepage = "http://clafer.org"; description = "claferIG is an interactive tool that generates instances of Clafer models"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -33599,15 +33780,16 @@ self: { "claferwiki" = callPackage ({ mkDerivation, base, clafer, containers, directory, gitit , MissingH, mtl, network, network-uri, process, SHA, split, time - , transformers, utf8-string + , transformers, transformers-compat, utf8-string }: mkDerivation { pname = "claferwiki"; - version = "0.4.0"; - sha256 = "d0b71d5568ad523fdd4f911c820719f2e00ce05f919cb4d24ffbc002efa7c0c6"; + version = "0.4.1"; + sha256 = "d61f2b7effa17209ab106a90f83ab6afdcea65e1da330bb2d387441d4ec80eb3"; libraryHaskellDepends = [ base clafer containers directory gitit MissingH mtl network - network-uri process SHA split time transformers utf8-string + network-uri process SHA split time transformers transformers-compat + utf8-string ]; homepage = "http://github.com/gsdlab/claferwiki"; description = "A wiki-based IDE for literate modeling with Clafer"; @@ -33662,8 +33844,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "0.5.11"; - sha256 = "efbdf2e6ef43b8dc59f8dd918d997f68cdd83ab92f04f5643b54f028d6218cd3"; + version = "0.5.13"; + sha256 = "135104a2d23bb86a686c0043d9b95307d766431e3beb98d06d41676ec4bdbcb2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -33688,8 +33870,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "0.5.10"; - sha256 = "b42daab696bbde48f4fd0af8e04bf4a5f268e5ebaa947f5669f9cd938329320d"; + version = "0.5.11"; + sha256 = "9b7b6b96d2a64fc24bc5379083ef023d7cc7e23d7cc2fe8a926682742ce59b6b"; libraryHaskellDepends = [ aeson attoparsec base bytestring clash-prelude concurrent-supply containers deepseq directory errors fgl filepath hashable lens mtl @@ -33740,8 +33922,8 @@ self: { }: mkDerivation { pname = "clash-systemverilog"; - version = "0.5.7"; - sha256 = "a5aae9795f3ecf3dad39197b7e518a164170132e893baeb2ab6aa90289c61e69"; + version = "0.5.8"; + sha256 = "cf7a6589a7d67960bac4533ea0a31d13d081b781b4598b07d04a6a895ab03036"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -33758,8 +33940,8 @@ self: { }: mkDerivation { pname = "clash-verilog"; - version = "0.5.7"; - sha256 = "72904082f2d03fd075c7b7ed0811e97daf707ac899b751885d624204823f8a13"; + version = "0.5.8"; + sha256 = "1b90d23a2d81e8c0962c22c8ae4b9ceb16ce1e64768f684476a4b50eec0c296e"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -33775,8 +33957,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.8"; - sha256 = "1cb035f474c64fd3afef98ea268698ff626447b16fc79991c75222aaeca61723"; + version = "0.5.10"; + sha256 = "a971c2bd050dc76c04b769952df63364a60abf868d5de5a47a892e649daf330a"; libraryHaskellDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -33895,6 +34077,7 @@ self: { testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit text ]; + jailbreak = true; homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; @@ -34144,6 +34327,7 @@ self: { homepage = "https://github.com/dfoxfranke/haskell-cld2"; description = "Haskell bindings to Google's Compact Language Detector 2"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "clean-home" = callPackage @@ -34330,20 +34514,20 @@ self: { "clippings" = callPackage ({ mkDerivation, assertions, base, bifunctors, bytestring, cassava - , data-default, filepath, old-locale, parsec, safecopy, strptime - , time + , data-default, filepath, functor-infix, old-locale, parsec + , safecopy, strptime, time }: mkDerivation { pname = "clippings"; - version = "0.1.3"; - sha256 = "79e3e0c4d2ab9a37bfd0fd35ce161de45e3acf96be1ecce93726a3cdf065a036"; + version = "0.2.0"; + sha256 = "8562481c8ba001b6c401d6ebfacd458fe44b19676ce8bd2e8694cd45cf825bdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors data-default old-locale parsec strptime time + base data-default functor-infix old-locale parsec strptime time ]; executableHaskellDepends = [ - base bifunctors bytestring cassava parsec safecopy + base bifunctors bytestring cassava functor-infix parsec safecopy ]; testHaskellDepends = [ assertions base data-default filepath old-locale parsec time @@ -34970,8 +35154,8 @@ self: { pname = "codepad"; version = "0.1"; sha256 = "215704a914c2006369c63cf6000385b2ece643839a8c0f2398353f46f65a5b0e"; - revision = "1"; - editedCabalFile = "52fe2b461d77b36400724ddd77e6ec5a92cb9c1bbf5f97efb4cfe87adba3a07a"; + revision = "3"; + editedCabalFile = "6f9d1a534fa6ff720347aa10521a99456aa4b9e2a95b45f71cadb06074277c86"; libraryHaskellDepends = [ base curl mtl network tagsoup ]; jailbreak = true; homepage = "http://github.com/chrisdone/codepad"; @@ -35439,11 +35623,14 @@ self: { }: mkDerivation { pname = "comfort-graph"; - version = "0.0.0.1"; - sha256 = "dc4cadda8bb9847f60f217d54590d5695597814557c70dafab9846b944dcfb8c"; + version = "0.0.0.3"; + sha256 = "e379d8d331d3b0245528a4c88a0fad369a2ad9a04f45f6e57546a342bf58c783"; libraryHaskellDepends = [ base containers QuickCheck transformers utility-ht ]; + testHaskellDepends = [ + base containers QuickCheck transformers utility-ht + ]; homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; @@ -35542,8 +35729,8 @@ self: { }: mkDerivation { pname = "commutative"; - version = "0.0.1.3"; - sha256 = "6d1a855914f5106ba8279a719ef8e9f97e24abab3079fcfd3253081348848ccd"; + version = "0.0.1.4"; + sha256 = "0de746012c73543b5dcf649434046e36d5e158e0967e8e2ae122e85d5457c9cf"; libraryHaskellDepends = [ base random semigroups ]; testHaskellDepends = [ base QuickCheck quickcheck-instances random semigroups tasty @@ -35642,6 +35829,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "compact-socket" = callPackage + ({ mkDerivation, base, binary, bytestring, compact, deepseq + , directory, filepath, network, unix + }: + mkDerivation { + pname = "compact-socket"; + version = "0.1.0.0"; + sha256 = "e758ee08d3013aebc013fe2d5eb1f529db56ea0f926bd2ba7bc1266cc1c9ee3b"; + libraryHaskellDepends = [ + base binary bytestring compact deepseq directory filepath network + unix + ]; + jailbreak = true; + description = "Socket functions for compact normal form"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {compact = null;}; + "compact-string" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -35876,12 +36081,12 @@ self: { }) {}; "composition-extra" = callPackage - ({ mkDerivation, base, contravariant }: + ({ mkDerivation, base, composition, contravariant }: mkDerivation { pname = "composition-extra"; - version = "1.1.0"; - sha256 = "e12fafa670548f4bb22a9948abeba4dc3ef06991738cef366a06a787400575d6"; - libraryHaskellDepends = [ base contravariant ]; + version = "1.2.0"; + sha256 = "de94ac4652901fd5da3c1c96cc18fa2ffef71465a293eca10adb08eac01bce18"; + libraryHaskellDepends = [ base composition contravariant ]; description = "Combinators for unorthodox structure composition"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -36184,6 +36389,7 @@ self: { async base HUnit random stm test-framework test-framework-hunit unbounded-delays ]; + jailbreak = true; homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; license = stdenv.lib.licenses.bsd3; @@ -36207,7 +36413,6 @@ self: { ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-sa" = callPackage @@ -36396,6 +36601,7 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit" = callPackage @@ -36489,6 +36695,7 @@ self: { homepage = "http://github.com/mtolly/conduit-audio"; description = "conduit-audio interface to the libsndfile audio file library"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "conduit-combinators" = callPackage @@ -36955,7 +37162,6 @@ self: { homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constrained-normal" = callPackage @@ -37049,6 +37255,7 @@ self: { homepage = "https://github.com/scrive/consumers"; description = "Concurrent PostgreSQL data consumers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "container-classes" = callPackage @@ -37074,6 +37281,7 @@ self: { jailbreak = true; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "containers_0_5_6_3" = callPackage @@ -37092,6 +37300,7 @@ self: { ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "containers-benchmark" = callPackage @@ -37111,6 +37320,7 @@ self: { homepage = "http://git.auryn.cz/haskell/containers-benchmark/"; description = "Extensive benchmark suite for containers package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "containers-deepseq" = callPackage @@ -37252,8 +37462,8 @@ self: { }: mkDerivation { pname = "contravariant"; - version = "1.3.2"; - sha256 = "52baae0676d6d5bcf7d891e6cda4580e58646c747d570bdde69b0023c2576639"; + version = "1.3.3"; + sha256 = "65390e2bde01c1cc91cfe414b5ad0aa9dcb26e527f0646719d19dbaf616590a0"; libraryHaskellDepends = [ base semigroups StateVar transformers transformers-compat void ]; @@ -37400,6 +37610,7 @@ self: { homepage = "http://github.com/pepeiborra/control-monad-free"; description = "Free monads and monad transformers"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-free" = callPackage @@ -37940,6 +38151,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "couch-simple" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , couchdb, data-default, directory, exceptions, filepath + , hjsonschema, hlint, http-client, http-types, integer-gmp, mtl + , random, tasty, tasty-hunit, text, transformers + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "couch-simple"; + version = "0.0.1.0"; + sha256 = "bf62acc13979f31c729e2aba4bb00ad451f026dbdb725ecedd122a806051ab9d"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring data-default exceptions + http-client http-types integer-gmp mtl text transformers + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring data-default directory exceptions filepath + hjsonschema hlint http-client http-types random tasty tasty-hunit + text transformers unordered-containers uuid + ]; + testToolDepends = [ couchdb ]; + homepage = "https://github.com/mdorman/couch-simple"; + description = "A modern, lightweight, complete client for CouchDB"; + license = stdenv.lib.licenses.mit; + }) {inherit (pkgs) couchdb;}; + "couchdb-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, conduit, containers, data-default @@ -38113,6 +38351,7 @@ self: { homepage = "https://github.com/nicodelpiano/coverage"; description = "Exhaustivity Checking Library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpio-conduit" = callPackage @@ -38222,7 +38461,6 @@ self: { executableHaskellDepends = [ array base containers parallel ]; description = "Symbolic cryptographic protocol analyzer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpu" = callPackage @@ -38594,6 +38832,7 @@ self: { MonadRandom mtl QuickCheck temporary test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/mhwombat/creatur"; description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; @@ -38726,6 +38965,7 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "criterion-plus" = callPackage @@ -38809,24 +39049,25 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, derive, hspec - , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text - , time, transformers-compat + ({ mkDerivation, attoparsec, base, derive, mtl, mtl-compat + , old-locale, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers-compat }: mkDerivation { pname = "cron"; - version = "0.3.0"; - sha256 = "3369302abbf131db159c4a4a8666d93e8dfbd4478c9aa56ca9d0ff45926bcaa3"; + version = "0.3.2"; + sha256 = "d20917bef00c1bf8b5edbd274292defa951ac1dc734f972c00d27e4ad9356086"; libraryHaskellDepends = [ attoparsec base mtl mtl-compat old-locale text time ]; testHaskellDepends = [ - attoparsec base derive hspec hspec-expectations QuickCheck text - time transformers-compat + attoparsec base derive tasty tasty-hunit tasty-quickcheck text time + transformers-compat ]; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -39259,8 +39500,8 @@ self: { }: mkDerivation { pname = "cryptonite"; - version = "0.6"; - sha256 = "a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853"; + version = "0.7"; + sha256 = "6cd4d9ff100b06a08ceac56eb12153633957797b309032a963cdf3841f92ecd9"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim integer-gmp memory ]; @@ -39709,6 +39950,7 @@ self: { libraryHaskellDepends = [ base hmatrix safe ]; description = "Natural cubic spline interpolation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cublas" = callPackage @@ -39741,6 +39983,7 @@ self: { executableHaskellDepends = [ base GLUT Yampa ]; description = "3D Yampa/GLUT Puzzle Game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cuda" = callPackage @@ -39978,6 +40221,7 @@ self: { ]; description = "Functional Combinators for Computer Vision"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cyclotomic" = callPackage @@ -40023,8 +40267,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.3"; - sha256 = "0e1eb50a1a1185bc898e87f93040f47b80d8a0beb132fb2c14a77b6720011f32"; + version = "0.1.3.1"; + sha256 = "3c22a5ddb373178203093f1bea6ea8921810e352df1cf1cc50b94c758cea96f9"; libraryHaskellDepends = [ async attoparsec base binary blaze-builder bytestring conduit conduit-extra containers data-binary-ieee754 data-default @@ -40092,6 +40336,7 @@ self: { homepage = "https://github.com/scvalex/daemons"; description = "Daemons in Haskell made fun and easy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dag" = callPackage @@ -41750,6 +41995,7 @@ self: { homepage = "https://github.com/iand675/datadog"; description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dataenc" = callPackage @@ -42511,8 +42757,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.7.2.2"; - sha256 = "e9ba2452da86da69f80ed6042de3ae73de83ee96b8483a845129b1dfc685e737"; + version = "0.8.0.0"; + sha256 = "07887be08bd4521fc76e272ed9c418a7c517c57360f07529206ea2b46ace52ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42640,6 +42886,7 @@ self: { jailbreak = true; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deepseq_1_4_1_2" = callPackage @@ -42654,8 +42901,10 @@ self: { testHaskellDepends = [ array base HUnit test-framework test-framework-hunit ]; + jailbreak = true; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "deepseq-bounded" = callPackage @@ -42899,6 +43148,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dejafu" = callPackage + ({ mkDerivation, base, containers, deepseq, exceptions, monad-loops + , mtl, random, stm, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "0.1.0.0"; + sha256 = "469c2f0690ede4ad83483d5ae82601471a7c737daddd116ad423d5b9202ee2b4"; + libraryHaskellDepends = [ + base containers deepseq exceptions monad-loops mtl random stm + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -43144,15 +43412,15 @@ self: { }) {}; "dequeue" = callPackage - ({ mkDerivation, base, QuickCheck, safe }: + ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck + , safe + }: mkDerivation { pname = "dequeue"; - version = "0.1.5"; - sha256 = "b4dbb63aac61981c0a14f6c00b0e8a68f3aecdc2a9051d4bc572d1303d1c8cfc"; - isLibrary = true; - isExecutable = true; + version = "0.1.12"; + sha256 = "c70aedbb1965affe07b7151f12e9a8e42f2cb54652bb0a0bbc5d0ba8e21721ab"; libraryHaskellDepends = [ base QuickCheck safe ]; - executableHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ base Cabal cabal-test-quickcheck ]; description = "A typeclass and an implementation for double-ended queues"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43354,6 +43622,7 @@ self: { 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 @@ -43450,6 +43719,7 @@ self: { homepage = "https://github.com/luanzhu/devil"; description = "A small tool to make it easier to update program managed by Angel"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dewdrop" = callPackage @@ -43595,7 +43865,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-cairo" = callPackage @@ -43617,6 +43887,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-canvas" = callPackage @@ -43649,8 +43920,8 @@ self: { }: mkDerivation { pname = "diagrams-contrib"; - version = "1.3.0.4"; - sha256 = "6e5abdadbe7c7dfb33681dcaf639de065efd0f9e68d84665ee12094027a92457"; + version = "1.3.0.5"; + sha256 = "9549fb1e1e305698646ba6360b137e0c9cd63ab0f7c33f3e6d814ad763116e77"; libraryHaskellDepends = [ base circle-packing colour containers data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -43696,6 +43967,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-haddock" = callPackage @@ -43728,7 +44000,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-hsqml" = callPackage @@ -43746,7 +44018,7 @@ self: { homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-html5" = callPackage @@ -43766,6 +44038,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-lib" = callPackage @@ -43790,6 +44063,7 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-pandoc" = callPackage @@ -43809,6 +44083,7 @@ self: { ]; description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-pdf" = callPackage @@ -43869,6 +44144,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-qrcode" = callPackage @@ -43906,6 +44182,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-rubiks-cube" = callPackage @@ -43920,6 +44197,7 @@ self: { homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-solve" = callPackage @@ -43954,6 +44232,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "diagrams-tikz" = callPackage @@ -43983,6 +44262,7 @@ self: { libraryHaskellDepends = [ base parsec random-fu transformers ]; description = "Simplistic D&D style dice-rolling system"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "dice-entropy-conduit" = callPackage @@ -44006,17 +44286,14 @@ self: { }) {}; "dicom" = callPackage - ({ mkDerivation, base, binary, bytestring, old-locale, pretty, safe - , time - }: + ({ mkDerivation, base, binary, bytestring, pretty, safe, time }: mkDerivation { pname = "dicom"; - version = "0.1.1.0"; - sha256 = "abe9f2f339239348136c412b1a6566d36b5d2310927ee18dbae8b95f52afc69a"; + version = "0.2.0.0"; + sha256 = "3772604143c86a3827e73924f5cbc404ab5506aabfa75f51396d3d54651e09fc"; libraryHaskellDepends = [ - base binary bytestring old-locale pretty safe time + base binary bytestring pretty safe time ]; - jailbreak = true; homepage = "http://github.com/dicomgrid/dicom-haskell-library/"; description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax"; license = stdenv.lib.licenses.gpl3; @@ -44220,6 +44497,7 @@ self: { 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; @@ -44547,6 +44825,7 @@ self: { homepage = "https://github.com/avieth/diplomacy-server"; description = "Play Diplomacy over HTTP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "direct-binary-files" = callPackage @@ -44683,6 +44962,7 @@ self: { testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directory-layout" = callPackage @@ -45402,6 +45682,7 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Return the diversity at each position for all sequences in a fasta file"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "djinn" = callPackage @@ -45701,13 +45982,14 @@ self: { }: mkDerivation { pname = "docopt"; - version = "0.7.0.2"; - sha256 = "537dcffe4f764836f69a39ff0e964d29e9c2962445f07a2df3a3e5dac1a7c230"; + version = "0.7.0.3"; + sha256 = "46b99042c83180e9ba90acd45e805a950e140d9deada150b9682a4d0a5532c8e"; libraryHaskellDepends = [ base containers parsec template-haskell th-lift ]; testHaskellDepends = [ aeson ansi-terminal base bytestring containers parsec split + template-haskell th-lift ]; homepage = "https://github.com/docopt/docopt.hs"; description = "A command-line interface parser that will make you smile"; @@ -45874,6 +46156,7 @@ self: { homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "domplate" = callPackage @@ -45958,6 +46241,7 @@ self: { homepage = "http://github.com/toothbrush/dotfs"; description = "Filesystem to manage and parse dotfiles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dotgen" = callPackage @@ -46020,6 +46304,7 @@ self: { ]; description = "Dungeons of Wor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "download" = callPackage @@ -46365,6 +46650,7 @@ self: { ]; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dropbox-sdk" = callPackage @@ -46567,7 +46853,6 @@ self: { executableHaskellDepends = [ base bytestring ]; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dtd" = callPackage @@ -46651,7 +46936,6 @@ self: { jailbreak = true; description = "(Fast) Dynamic Time Warping"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dual-tree" = callPackage @@ -46908,6 +47192,7 @@ self: { homepage = "https://github.com/adamwalker/dynamic-graph"; description = "Draw and update graphs in real time with OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dynamic-linker-template" = callPackage @@ -47289,7 +47574,6 @@ self: { homepage = "http://thoughtpolice.github.com/hs-ed25519"; description = "ed25519 cryptographic signatures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ed25519-donna" = callPackage @@ -47485,7 +47769,6 @@ self: { homepage = "https://github.com/maxpow4h/editable"; description = "Interactive editors for Generics"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "editline" = callPackage @@ -47969,6 +48252,7 @@ self: { homepage = "https://bitbucket.org/davecturner/ekg-rrd"; description = "Passes ekg statistics to rrdtool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ekg-statsd" = callPackage @@ -47997,6 +48281,7 @@ self: { testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "easy to remember mnemonic for a high-entropy value"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "elerea" = callPackage @@ -48024,6 +48309,7 @@ self: { executableHaskellDepends = [ base elerea GLFW OpenGL ]; description = "Example applications for Elerea"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "elerea-sdl" = callPackage @@ -48093,7 +48379,6 @@ self: { homepage = "http://github.com/JoeyEremondi/elm-build-lib"; description = "Compile Elm code to JS within Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-compiler" = callPackage @@ -48134,7 +48419,6 @@ self: { homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-core-sources" = callPackage @@ -48178,7 +48462,6 @@ self: { homepage = "http://github.com/elm-lang/elm-get"; description = "Tool for sharing and using Elm libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-init" = callPackage @@ -48219,7 +48502,6 @@ self: { homepage = "http://elm-lang.org"; description = "A build tool for Elm projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-package" = callPackage @@ -48251,7 +48533,6 @@ self: { homepage = "http://github.com/elm-lang/elm-package"; description = "Package manager for Elm libraries"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-reactor" = callPackage @@ -48276,7 +48557,6 @@ self: { homepage = "http://elm-lang.org"; description = "Interactive development tool for Elm programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-repl" = callPackage @@ -48303,7 +48583,6 @@ self: { homepage = "https://github.com/elm-lang/elm-repl"; description = "a REPL for Elm"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-server" = callPackage @@ -48324,7 +48603,6 @@ self: { homepage = "http://elm-lang.org"; description = "Server for developing Elm projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-yesod" = callPackage @@ -48342,7 +48620,6 @@ self: { homepage = "http://elm-lang.org"; description = "The Elm language Yesod compatibility module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elocrypt" = callPackage @@ -48383,6 +48660,7 @@ self: { homepage = "https://github.com/cocreature/emacs-keys"; description = "library to parse emacs style keybinding into the modifiers and the chars"; license = stdenv.lib.licenses.isc; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "email" = callPackage @@ -48934,6 +49212,7 @@ self: { homepage = "http://epanet.de/developer/haskell.html"; description = "Haskell binding for EPANET"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epass" = callPackage @@ -48964,6 +49243,7 @@ self: { homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php"; description = "Compiler for a simple functional language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epoll" = callPackage @@ -49026,6 +49306,7 @@ self: { homepage = "http://hub.darcs.net/dino/epub-metadata"; description = "Library for parsing epub document metadata"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epub-tools" = callPackage @@ -49048,6 +49329,7 @@ self: { homepage = "http://hub.darcs.net/dino/epub-tools"; description = "Command line utilities for working with epub files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "epubname" = callPackage @@ -49844,6 +50126,7 @@ self: { homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "every-bit-counts" = callPackage @@ -49992,6 +50275,7 @@ self: { base HUnit test-framework test-framework-hunit transformers transformers-compat ]; + jailbreak = true; description = "Type classes and monads for unchecked extensible exceptions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -50546,6 +50830,7 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th void ]; + jailbreak = true; homepage = "https://github.com/suhailshergill/extensible-effects"; description = "An Alternative to Monad Transformers"; license = stdenv.lib.licenses.mit; @@ -50966,6 +51251,7 @@ self: { homepage = "https://github.com/cscherrer/fastbayes"; description = "Bayesian modeling algorithms accelerated for particular model structures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fastcgi" = callPackage @@ -51273,8 +51559,8 @@ self: { }: mkDerivation { pname = "fclabels"; - version = "2.0.2.2"; - sha256 = "4865e78c114120bde4313ee9b0e90d39e4e03292c7c80f20359140e167ad754b"; + version = "2.0.2.3"; + sha256 = "82ba7747afeec6526d3bc2df61b222ae71b45aa3dd8bb8787e9ab2c537f6fad5"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -51384,8 +51670,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "0.3.10.0"; - sha256 = "74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094"; + version = "0.3.10.1"; + sha256 = "103205cc503211596f11257bdb34ed999fddf9d9f2a7b937e81f2a500f832a9b"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -51436,6 +51722,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "feed-translator" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, bytestring + , cmdargs, containers, cryptohash, feed, iso639, lens + , naver-translate, network-uri, raw-strings-qq, scotty, text + , transformers, wai, warp, wreq, xml + }: + mkDerivation { + pname = "feed-translator"; + version = "0.1.0.2"; + sha256 = "9c879595e3196cb687d70366207e84b43f2b2e2d7d3d9060f354b9dd7eb2d544"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base blaze-html blaze-markup bytestring cmdargs containers + cryptohash feed iso639 lens naver-translate network-uri + raw-strings-qq scotty text transformers wai warp wreq xml + ]; + jailbreak = true; + homepage = "https://github.com/dahlia/feed-translator"; + description = "Translate syndication feeds"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "feed2lj" = callPackage ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string @@ -51967,6 +52277,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "A Linux-only cache system associating values to files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "filediff" = callPackage @@ -52032,6 +52343,7 @@ self: { homepage = "https://github.com/haskell/filepath#readme"; description = "Library for manipulating FilePaths in a cross platform way"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filepath-io-access" = callPackage @@ -52079,6 +52391,7 @@ self: { testHaskellDepends = [ base Diff directory filepath HUnit mtl time ]; + jailbreak = true; description = "Interface for versioning file stores"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -52293,17 +52606,17 @@ self: { }) {}; "fishfood" = callPackage - ({ mkDerivation, base, Cabal, containers, factory, mtl, QuickCheck - , toolshed, unix + ({ mkDerivation, base, Cabal, containers, directory, factory, mtl + , QuickCheck, toolshed }: mkDerivation { pname = "fishfood"; - version = "0.0.1.3"; - sha256 = "5318e06292c0530f60ff93b9a0182034fcc799112fe6b0acf6c7a7f72a11b72e"; + version = "0.0.1.4"; + sha256 = "ffdc12216f142512efca5b2a5c369f040cdf24fdb355f990d209447da9a7fed2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base Cabal containers factory mtl QuickCheck toolshed unix + base Cabal containers directory factory mtl QuickCheck toolshed ]; homepage = "http://functionalley.eu"; description = "Calculates file-size frequency-distribution"; @@ -52496,11 +52809,10 @@ self: { ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; - version = "0.8.0.0"; - sha256 = "39da25f74a7c0760cb4675b0116eb9581232de57566e7b323e135e1157068fc2"; + version = "0.8.1.0"; + sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base doctest filemanip primitive ]; - jailbreak = true; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -53186,6 +53498,7 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce"; description = "Fold multiple events that happen in a given period of time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fold-debounce-conduit" = callPackage @@ -53207,6 +53520,7 @@ self: { homepage = "https://github.com/debug-ito/fold-debounce-conduit"; description = "Regulate input traffic from conduit Source with Control.FoldDebounce"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "foldl" = callPackage @@ -53249,20 +53563,23 @@ self: { "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers - , doctest, foldl, semigroupoids, tasty, tasty-hunit, text - , transformers + , doctest, foldl, free, monoid-subclasses, semigroupoids, tasty + , tasty-hunit, text, transformers }: mkDerivation { pname = "foldl-transduce"; - version = "0.1.2.3"; - sha256 = "8c24ca4a7932b83fd630475ac59a48879adbe03dda6136cc493f9ad0742d5bd5"; + version = "0.4.0.0"; + sha256 = "6fb85b94e356030f0be4fedb7b99c11b2f532d6b92b81b32ce0e27632f9cbb32"; libraryHaskellDepends = [ - base bifunctors bytestring comonad containers foldl semigroupoids - text transformers + base bifunctors bytestring comonad containers foldl free + monoid-subclasses semigroupoids text transformers + ]; + testHaskellDepends = [ + base doctest foldl free monoid-subclasses tasty tasty-hunit text ]; - testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ]; description = "Transducers for foldl folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "folds" = callPackage @@ -54147,8 +54464,8 @@ self: { homepage = "https://github.com/chrisdone/freenect"; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {freenect = null; freenect_sync = null;}; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + }) {inherit (pkgs) freenect; freenect_sync = null;}; "freesect" = callPackage ({ mkDerivation, array, base, cpphs, directory, mtl, parallel @@ -54330,6 +54647,7 @@ self: { homepage = "https://github.com/atzeus/FRPNow"; description = "Program awesome stuff with Gloss and frpnow!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "frpnow-gtk" = callPackage @@ -54423,6 +54741,7 @@ self: { homepage = "https://github.com/haskell-fswatch/hfsnotify"; description = "Cross platform library for file change notification"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "fst" = callPackage @@ -54474,7 +54793,7 @@ self: { homepage = "http://www.github.com/ehamberg/fswatcher/"; description = "Watch a file/directory and run a command when it's modified"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ftdi" = callPackage @@ -54624,6 +54943,7 @@ self: { testHaskellDepends = [ base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; homepage = "http://hub.darcs.net/kowey/fullstop"; description = "Simple sentence segmenter"; license = stdenv.lib.licenses.bsd3; @@ -54640,6 +54960,7 @@ self: { homepage = "http://savannah.nongnu.org/projects/funcmp/"; description = "Functional MetaPost"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "function-combine" = callPackage @@ -54942,8 +55263,8 @@ self: { }: mkDerivation { pname = "fwgl"; - version = "0.1.3.1"; - sha256 = "9f1426ce575f72694e663cfabf8e12083feac2353ffec0c1c3a94166aa7563e6"; + version = "0.1.4.0"; + sha256 = "428d265e21b498e90e74a3a695d1940e4264481d3eda0a9f5bb0e70031e15d8f"; libraryHaskellDepends = [ base hashable transformers unordered-containers vect vector Yampa ]; @@ -54959,10 +55280,8 @@ self: { }: mkDerivation { pname = "fwgl-glfw"; - version = "0.1.1.0"; - sha256 = "1393f48dafc63c43db18cc7f26ec04c3a258ea8cc7fb7525d2c92309509c140b"; - revision = "1"; - editedCabalFile = "9e4d781888a4b29f18d2759638f5562367daea4f7f8fbb78590c9e981209b848"; + version = "0.1.1.1"; + sha256 = "043af8e10112bf529f4734d3337f2f8ae683bf59083d85350eba52c5387ffc1b"; libraryHaskellDepends = [ base fwgl gl GLFW-b hashable JuicyPixels transformers unordered-containers vect vector @@ -54978,8 +55297,8 @@ self: { }: mkDerivation { pname = "fwgl-javascript"; - version = "0.1.1.0"; - sha256 = "ccfb9320bb0a205cfa1f977c2ab73f3640dfa7317d02ad115a4525c5633efa80"; + version = "0.1.1.1"; + sha256 = "858b6cc2cbba16819464446b174fb36108b76b1c503f20dbf1e41c3a470a7786"; libraryHaskellDepends = [ base fwgl ghcjs-base hashable unordered-containers vect ]; @@ -55904,6 +56223,7 @@ self: { jailbreak = true; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "geojson" = callPackage @@ -55938,6 +56258,7 @@ self: { testHaskellDepends = [ base ieee754 QuickCheck ]; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "getemx" = callPackage @@ -56203,7 +56524,6 @@ self: { ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-gc-tune" = callPackage @@ -56453,6 +56773,7 @@ self: { libraryHaskellDepends = [ rts ]; description = "GHC primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-prof-flamegraph" = callPackage @@ -56501,6 +56822,7 @@ self: { libraryHaskellDepends = [ array base containers ghc hpc ]; description = "Generic GHC Plugin for annotating Haskell code with source location data"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; }) {}; "ghc-syb" = callPackage @@ -56693,6 +57015,7 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghcjs-codemirror" = callPackage @@ -56719,6 +57042,7 @@ self: { ]; description = "DOM library that supports both GHCJS and WebKitGTK"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghcjs-dom-hello" = callPackage @@ -56733,6 +57057,7 @@ self: { homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ghcjs-websockets" = callPackage @@ -56889,7 +57214,6 @@ self: { homepage = "https://github.com/nomeata/gipeda"; description = "Git Performance Dashboard"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -56984,6 +57308,7 @@ self: { homepage = "http://git-annex.branchable.com/"; description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; @@ -57109,7 +57434,6 @@ self: { homepage = "http://github.com/jwiegley/gitlib"; description = "Passively snapshots working tree changes efficiently"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-object" = callPackage @@ -57352,14 +57676,15 @@ self: { }: mkDerivation { pname = "github-webhook-handler"; - version = "0.0.3"; - sha256 = "308d7915e36b768a046d7e3edabc6e2877e3c89d63f93e4f82cfdac7980b98b7"; + version = "0.0.4"; + sha256 = "4bbc9a84406d381ff65f7850b4554cc22a03d90c7186adf2cb75752c6f9ac66c"; libraryHaskellDepends = [ aeson base bytestring cryptohash github-types text transformers uuid vector ]; description = "GitHub WebHook Handler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-webhook-handler-snap" = callPackage @@ -57368,14 +57693,15 @@ self: { }: mkDerivation { pname = "github-webhook-handler-snap"; - version = "0.0.3"; - sha256 = "3e26bfe203a127ce38865ab3d38adffa0d5d5278f6cded5a40329320acaa3c6d"; + version = "0.0.4"; + sha256 = "73b3b250c749f6235e4e1915f2439198816329f6722b2c1bf503a70353e9a582"; libraryHaskellDepends = [ base bytestring case-insensitive github-types github-webhook-handler snap-core uuid ]; description = "GitHub WebHook Handler implementation for Snap"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -57524,7 +57850,6 @@ self: { ]; description = "Libgit2 backend for gitlib"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib-s3" = callPackage @@ -57671,6 +57996,7 @@ self: { libraryHaskellDepends = [ base bytestring OpenGL ]; description = "simple image capture from OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glade" = callPackage @@ -57703,29 +58029,27 @@ self: { "glambda" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, directory - , errors, haskeline, mtl, parsec, tasty, tasty-hunit - , template-haskell + , either, haskeline, mtl, parsec, tasty, tasty-hunit + , template-haskell, transformers }: mkDerivation { pname = "glambda"; - version = "1.0"; - sha256 = "0ef6fc8e1fedc034c6d392aad4323b1b4c825e34b1a18affc6022873de817805"; + version = "1.0.1"; + sha256 = "da42696d4ad985cd10d249457d801a234c04a29ef08acdbbd91544dabce2d16f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers directory errors haskeline mtl - parsec + ansi-wl-pprint base containers directory either haskeline mtl + parsec transformers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - ansi-wl-pprint base errors mtl parsec tasty tasty-hunit + ansi-wl-pprint base either mtl parsec tasty tasty-hunit template-haskell ]; - jailbreak = true; homepage = "https://github.com/goldfirere/glambda"; description = "A simply typed lambda calculus interpreter, written with GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glapp" = callPackage @@ -57744,6 +58068,7 @@ self: { homepage = "zyghost.com"; description = "An OpenGL micro framework"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glasso" = callPackage @@ -57920,6 +58245,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss" = callPackage @@ -57937,6 +58263,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-accelerate" = callPackage @@ -57962,6 +58289,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-banana" = callPackage @@ -57973,9 +58301,11 @@ self: { revision = "1"; editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a"; libraryHaskellDepends = [ base gloss reactive-banana ]; + jailbreak = true; homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-devil" = callPackage @@ -58010,6 +58340,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Examples using the gloss library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-game" = callPackage @@ -58022,6 +58353,7 @@ self: { homepage = "https://github.com/mchakravarty/gloss-game"; description = "Gloss wrapper that simplifies writing games"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-juicy" = callPackage @@ -58042,6 +58374,7 @@ self: { homepage = "http://github.com/alpmestan/gloss-juicy"; description = "Load any image supported by Juicy.Pixels in your gloss application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-raster" = callPackage @@ -58058,6 +58391,7 @@ self: { homepage = "http://gloss.ouroborus.net"; description = "Parallel rendering of raster images"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-raster-accelerate" = callPackage @@ -58087,6 +58421,7 @@ self: { jailbreak = true; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gloss-sodium" = callPackage @@ -58100,6 +58435,7 @@ self: { homepage = "https://github.com/Twey/gloss-sodium"; description = "A Sodium interface to the Gloss drawing package"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "glpk-hs" = callPackage @@ -58143,6 +58479,94 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glue-common" = callPackage + ({ mkDerivation, async, base, ekg-core, hashable, hspec + , lifted-base, monad-control, QuickCheck, quickcheck-instances + , text, time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "glue-common"; + version = "0.4.1"; + sha256 = "ee474188b6dbb022312f4f74bd16e3cd2915bc4d7699169b29d76482ec4b23b8"; + libraryHaskellDepends = [ + base hashable lifted-base monad-control text time transformers + transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core hashable hspec lifted-base monad-control + QuickCheck quickcheck-instances text time transformers + transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-core" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, hashable + , hspec, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "glue-core"; + version = "0.4.1"; + sha256 = "d9be37ce2995583086c960c18c9457e83b9adea0b2feff7e422af6292ee0b347"; + libraryHaskellDepends = [ + base glue-common hashable lifted-base monad-control text time + transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core glue-common hashable hspec lifted-base + monad-control QuickCheck quickcheck-instances text time + transformers transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-ekg" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, hashable + , hspec, lifted-base, monad-control, QuickCheck + , quickcheck-instances, text, time, transformers, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "glue-ekg"; + version = "0.4.1"; + sha256 = "f655a9c8f0af74dcc5483b7974bba30d071d2e6e658ed89de4c407922cdf58e4"; + libraryHaskellDepends = [ + base ekg-core glue-common hashable lifted-base monad-control text + time transformers transformers-base unordered-containers + ]; + testHaskellDepends = [ + async base ekg-core glue-common hashable hspec lifted-base + monad-control QuickCheck quickcheck-instances text time + transformers transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "glue-example" = callPackage + ({ mkDerivation, async, base, ekg-core, glue-common, glue-core + , glue-ekg, hashable, lifted-base, monad-control, monad-loops, text + , time, transformers, transformers-base, unordered-containers + }: + mkDerivation { + pname = "glue-example"; + version = "0.4.1"; + sha256 = "00a55b518dc5cb0678f5c943beb6b46a8089b1907315a5e96319146ee796b5cf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + async base ekg-core glue-common glue-core glue-ekg hashable + lifted-base monad-control monad-loops text time transformers + transformers-base unordered-containers + ]; + description = "Make better services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gluturtle" = callPackage ({ mkDerivation, base, convertible, GLUT, stm, yjsvg, yjtools }: mkDerivation { @@ -58154,6 +58578,7 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gmap" = callPackage @@ -58258,6 +58683,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-gnuidn/"; description = "Bindings for GNU IDN"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libidn;}; "gnuplot" = callPackage @@ -58321,6 +58747,7 @@ self: { base containers mtl parsec template-haskell ]; testHaskellDepends = [ base containers HUnit mtl parsec ]; + jailbreak = true; homepage = "http://khumba.net/projects/goatee"; description = "A monadic take on a 2,500-year-old board game - library"; license = stdenv.lib.licenses.agpl3; @@ -58412,7 +58839,6 @@ self: { ]; description = "Google Drive API access"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-html5-slide" = callPackage @@ -59120,6 +59546,7 @@ self: { homepage = "http://github.com/luqui/graphics-drawingcombinators"; description = "A functional interface to 2D drawing in OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "graphics-formats-collada" = callPackage @@ -59225,13 +59652,13 @@ self: { "graphviz" = callPackage ({ mkDerivation, base, bytestring, colour, containers, directory - , dlist, fgl, filepath, polyparse, process, QuickCheck, temporary - , text, transformers, wl-pprint-text + , dlist, fgl, fgl-arbitrary, filepath, polyparse, process + , QuickCheck, temporary, text, transformers, wl-pprint-text }: mkDerivation { pname = "graphviz"; - version = "2999.17.0.2"; - sha256 = "23c8626061e85eb09021e93e69bad3fc83619187e5f5e55fb6a3f35b8b6bd6fd"; + version = "2999.18.0.0"; + sha256 = "8b02e093a4dcb5ec8a272101d652d4bde5a14186a2a8113d240d75795ba2f9bb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -59242,9 +59669,8 @@ self: { base bytestring directory filepath text ]; testHaskellDepends = [ - base containers fgl filepath QuickCheck text + base containers fgl fgl-arbitrary filepath QuickCheck text ]; - jailbreak = true; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -59377,7 +59803,7 @@ self: { ]; description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "grm" = callPackage @@ -59830,6 +60256,7 @@ self: { testHaskellDepends = [ base containers gtk3 hspec ]; description = "Large TreeStore support for gtk2hs"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gtk-mac-integration" = callPackage @@ -60051,6 +60478,7 @@ self: { homepage = "http://www.haskell.org/hello/"; description = "Gtk2Hs Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "gtk2hs-rpn" = callPackage @@ -60088,6 +60516,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -60198,6 +60627,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage @@ -60306,6 +60736,7 @@ self: { base bindings-gpgme bytestring either HUnit QuickCheck tasty tasty-hunit tasty-quickcheck time transformers unix ]; + jailbreak = true; homepage = "https://github.com/rethab/h-gpgme"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -60331,7 +60762,6 @@ self: { homepage = "https://github.com/Javran/h2048"; description = "a haskell implementation of Game 2048"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hArduino" = callPackage @@ -60722,6 +61152,7 @@ self: { ]; description = "A Gtk mixer GUI application for FreeBSD"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haar" = callPackage @@ -61185,6 +61616,7 @@ self: { homepage = "http://github.com/peti/hackage-db"; description = "access Hackage's package database via Data.Map"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hackage-diff" = callPackage @@ -61239,7 +61671,6 @@ self: { homepage = "http://fpcomplete.com"; description = "Simple mirroring utility for Hackage"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-plot" = callPackage @@ -61596,6 +62027,7 @@ self: { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddock-api" = callPackage @@ -62042,9 +62474,11 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat ]; + jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hakyll-R" = callPackage @@ -62079,6 +62513,7 @@ self: { homepage = "https://github.com/bitonic/hakyll-agda"; description = "Wrapper to integrate literate Agda files with Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hakyll-blaze-templates" = callPackage @@ -62122,6 +62557,7 @@ self: { homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hakyll-contrib-links" = callPackage @@ -62185,15 +62621,21 @@ self: { }) {}; "hakyll-sass" = callPackage - ({ mkDerivation, base, data-default-class, hakyll, hsass }: + ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass + }: mkDerivation { pname = "hakyll-sass"; - version = "0.1.0"; - sha256 = "b127379ebf20f96f5974a9f8212aa3aeed04b9e22788bc29cc9994f6f69e926c"; - libraryHaskellDepends = [ base data-default-class hakyll hsass ]; + version = "0.2.0"; + sha256 = "1c0b131f3a581aafde543fc9c3211d75c6f17f6b25d0e32cf6032f4c3377dbc5"; + revision = "1"; + editedCabalFile = "afdc3b9e76e09fc1aaf7f9cceb780a2e062ec56aab20659804b8f35d3bb85bb5"; + libraryHaskellDepends = [ + base data-default-class filepath hakyll hsass + ]; homepage = "https://github.com/meoblast001/hakyll-sass"; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "halberd" = callPackage @@ -62299,7 +62741,7 @@ self: { homepage = "https://github.com/lukexi/halive"; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "halma" = callPackage @@ -62328,6 +62770,7 @@ self: { homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haltavista" = callPackage @@ -62559,7 +63002,6 @@ self: { ]; description = "IPv4 Network Stack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pcap" = callPackage @@ -62573,7 +63015,6 @@ self: { homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pfq" = callPackage @@ -62788,6 +63229,7 @@ self: { homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-clientsession" = callPackage @@ -62840,6 +63282,8 @@ self: { pname = "happstack-data"; version = "6.0.1"; sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c"; + revision = "1"; + editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62966,7 +63410,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hamlet" = callPackage @@ -63042,7 +63485,6 @@ self: { homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-hstringtemplate" = callPackage @@ -63570,6 +64012,7 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base numbers ]; testHaskellDepends = [ HUnit ]; + jailbreak = true; homepage = "http://darcsden.com/mekeor/hascal"; description = "A minimalistic but extensible and precise calculator"; license = "GPL"; @@ -63941,6 +64384,7 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -63960,7 +64404,7 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haskarrow" = callPackage @@ -64079,6 +64523,7 @@ self: { homepage = "http://trac.haskell.org/haskeline"; description = "A command-line interface for user input, written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskeline-class" = callPackage @@ -64409,6 +64854,7 @@ self: { homepage = "http://github.com/bjpop/haskell-mpi"; description = "Distributed parallel programming in Haskell using MPI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage @@ -64662,6 +65108,7 @@ self: { 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 @@ -65035,7 +65482,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for HDBC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb-hdbc-mysql" = callPackage @@ -65073,7 +65519,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HDBC ODBC driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb-hdbc-postgresql" = callPackage @@ -65093,7 +65538,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HDBC PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) postgresql;}; "haskelldb-hdbc-sqlite3" = callPackage @@ -65112,7 +65556,6 @@ self: { homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HDBC SQLite driver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb-hsql" = callPackage @@ -65441,7 +65884,6 @@ self: { jailbreak = true; description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin" = callPackage @@ -65660,13 +66102,13 @@ self: { "haskore" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-accessor - , event-list, haskell-src, markov-chain, midi, non-negative, parsec - , process, random, transformers, utility-ht + , event-list, haskell-src, HUnit, markov-chain, midi, non-negative + , parsec, process, QuickCheck, random, transformers, utility-ht }: mkDerivation { pname = "haskore"; - version = "0.2.0.5"; - sha256 = "a0add738763457b1a037cc2f4e37f6f5f20ddcd9fe04638479016cdb393c797f"; + version = "0.2.0.7"; + sha256 = "5ebbd8bf1d5164a67c12d7f42e6c2cc4f3a0ea996fd5644651c0ea5f6e579a92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65674,6 +66116,10 @@ self: { haskell-src markov-chain midi non-negative parsec process random transformers utility-ht ]; + testHaskellDepends = [ + base bytestring data-accessor event-list HUnit midi non-negative + process QuickCheck random transformers utility-ht + ]; homepage = "http://www.haskell.org/haskellwiki/Haskore"; description = "The Haskore Computer Music System"; license = "GPL"; @@ -65995,8 +66441,8 @@ self: { }: mkDerivation { pname = "haste-compiler"; - version = "0.5.0.1"; - sha256 = "00ceeb7f2b6e7f98a5b8db08f27e5d05013412ec7f8a4df603ef7707e5cc7892"; + version = "0.5.1.3"; + sha256 = "5413178f27e4519e80680aebe534db2576e983411af3bfb1c60d7c2c2f201e38"; configureFlags = [ "-fportable" ]; isLibrary = true; isExecutable = true; @@ -66013,7 +66459,6 @@ self: { random shellmate system-fileio tar terminfo transformers unix utf8-string ]; - jailbreak = true; homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; @@ -66522,6 +66967,7 @@ self: { homepage = "https://github.com/k0ral/hbro"; description = "Minimal extensible web-browser"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hbro-contrib" = callPackage @@ -66709,8 +67155,8 @@ self: { homepage = "https://github.com/ivanperez-keera/hcwiid"; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {bluetooth = null; cwiid = null;}; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog @@ -67204,6 +67650,7 @@ self: { testHaskellDepends = [ base bytestring HUnit mtl test-framework test-framework-hunit time ]; + jailbreak = true; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; @@ -67658,7 +68105,7 @@ self: { homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hen" = callPackage @@ -68190,15 +68637,15 @@ self: { "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator , containers, directory, exceptions, filepath, HandsomeSoup, hspec - , http-types, hxt, iso8601-time, MissingH, mtl, multipart - , optparse-applicative, random, silently, stm, tar, temporary, text - , time, transformers, unix, unordered-containers, utf8-string, wai - , warp + , hspec-wai, http-types, hxt, iso8601-time, MissingH, mtl + , multipart, optparse-applicative, random, silently, stm, tar + , temporary, text, time, transformers, unix, unordered-containers + , utf8-string, wai, wai-extra, warp }: mkDerivation { pname = "heyefi"; - version = "0.1.1.1"; - sha256 = "0efccccc2f8b0cfce5496a39df575d50f007611ebfcc7bc260f74911ac6fa936"; + version = "1.0.0.0"; + sha256 = "76faae3d15478468c5c77021e8de886143da550e11e540fbd0e4abf8e1f24886"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68209,10 +68656,10 @@ self: { ]; testHaskellDepends = [ base bytestring case-insensitive configurator containers directory - exceptions filepath HandsomeSoup hspec http-types hxt iso8601-time - MissingH mtl multipart optparse-applicative random silently stm tar - temporary text time transformers unix unordered-containers - utf8-string wai warp + exceptions filepath HandsomeSoup hspec hspec-wai http-types hxt + iso8601-time MissingH mtl multipart optparse-applicative random + silently stm tar temporary text time transformers unix + unordered-containers utf8-string wai wai-extra warp ]; homepage = "https://github.com/ryantm/heyefi"; description = "A server for Eye-Fi SD cards"; @@ -68303,6 +68750,7 @@ self: { executableHaskellDepends = [ base ]; description = "Hess-Smith panel code for inviscid 2-d airfoil analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hfov" = callPackage @@ -68495,6 +68943,7 @@ self: { homepage = "http://fstaals.net/software/hgeometry"; description = "Data types for geometric objects, geometric algorithms, and data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgettext" = callPackage @@ -68588,6 +69037,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hgrib" = callPackage + ({ mkDerivation, base, c2hs, directory, grib_api, hspec }: + mkDerivation { + pname = "hgrib"; + version = "0.2.0.0"; + sha256 = "0a695a9e165053c5244ad92808025633cbe7d7950b67278902bcbc3fea34c7d8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ grib_api ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base directory hspec ]; + jailbreak = true; + homepage = "https://github.com/mjakob/hgrib"; + description = "Unofficial bindings for GRIB API"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {grib_api = null;}; + "hharp" = callPackage ({ mkDerivation, base, harp }: mkDerivation { @@ -68674,11 +69143,12 @@ self: { }: mkDerivation { pname = "hid"; - version = "0.2.1"; - sha256 = "b0d5c499189207c41943c14b0b0ba5b9b19a504d30e670f4a49111bd808e5ba3"; + version = "0.2.1.1"; + sha256 = "290cddbf84e35b25d7140a1a670747981d87786ad2f918e97c8f335b9a15bd5c"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ hidapi-libusb ]; libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/phaazon/hid"; description = "Interface to hidapi library"; license = stdenv.lib.licenses.bsd3; }) {hidapi-libusb = null;}; @@ -68694,6 +69164,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "hieraclus" = callPackage @@ -68828,6 +69299,7 @@ self: { homepage = "https://github.com/jeremyjh/higher-leveldb"; description = "A rich monadic API for working with leveldb databases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "higherorder" = callPackage @@ -68861,6 +69333,7 @@ self: { homepage = "https://github.com/agrafix/highjson"; description = "Very fast JSON serialisation and parsing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "highlight-versions" = callPackage @@ -69146,6 +69619,7 @@ self: { homepage = "https://github.com/kolmodin/hinotify.git"; description = "Haskell binding to inotify"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hinquire" = callPackage @@ -69201,6 +69675,7 @@ self: { testHaskellDepends = [ base directory exceptions extensible-exceptions filepath HUnit mtl ]; + jailbreak = true; homepage = "http://hub.darcs.net/jcpetruzza/hint"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; @@ -69288,6 +69763,7 @@ self: { homepage = "http://fstaals.net/software/hipe"; description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hips" = callPackage @@ -69848,6 +70324,7 @@ self: { homepage = "https://github.com/gebner/hledger-diff"; description = "Compares the transactions in two ledger files"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ gebner ]; }) {}; "hledger-interest" = callPackage @@ -69864,6 +70341,7 @@ self: { homepage = "http://github.com/peti/hledger-interest"; description = "computes interest for a given account"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hledger-irr" = callPackage @@ -69881,6 +70359,7 @@ self: { ]; description = "computes the internal rate of return of an investment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "hledger-lib" = callPackage @@ -69981,6 +70460,7 @@ self: { homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage @@ -70186,6 +70666,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) blas; lapack = null;}; "hmatrix-banded" = callPackage @@ -70213,6 +70694,7 @@ self: { homepage = "https://github.com/grtlr/hmatrix-csv"; description = "CSV encoding and decoding for hmatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-glpk" = callPackage @@ -70226,6 +70708,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Linear Programming based on GLPK"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage @@ -70242,6 +70725,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numerical computation"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage @@ -70268,6 +70752,7 @@ self: { homepage = "http://github.com/alanfalloon/hmatrix-mmap"; description = "Memory map Vector from disk into memory efficiently"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-nipals" = callPackage @@ -70282,6 +70767,7 @@ self: { homepage = "http://github.com/alanfalloon/hmatrix-nipals"; description = "NIPALS method for Principal Components Analysis on large data-sets"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-quadprogpp" = callPackage @@ -70307,6 +70793,7 @@ self: { homepage = "http://code.haskell.org/hmatrix-repa"; description = "Adaptors for interoperability between hmatrix and repa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-special" = callPackage @@ -70319,6 +70806,7 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Interface to GSL special functions"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-static" = callPackage @@ -70352,6 +70840,7 @@ self: { homepage = "http://github.com/bgamari/hmatrix-svdlibc"; description = "SVDLIBC bindings for HMatrix"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hmatrix-syntax" = callPackage @@ -70650,6 +71139,7 @@ self: { homepage = "https://github.com/ian-ross/hnetcdf"; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) netcdf;}; "hnix" = callPackage @@ -71111,7 +71601,7 @@ self: { description = "OpenNI 2 binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {OpenNI2 = null; freenect = null;}; + }) {OpenNI2 = null; inherit (pkgs) freenect;}; "honk" = callPackage ({ mkDerivation, base }: @@ -71434,7 +71924,6 @@ self: { homepage = "http://github.com/bgamari/hoogle-index"; description = "Easily generate Hoogle indices for installed packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hooks-dir" = callPackage @@ -71465,6 +71954,7 @@ self: { homepage = "http://ghc.cs.tufts.edu/hoopl/"; description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoovie" = callPackage @@ -71573,6 +72063,7 @@ self: { homepage = "http://github.com/peti/hopenssl"; description = "FFI bindings to OpenSSL's EVP digest interface"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) openssl;}; "hopfield" = callPackage @@ -71645,6 +72136,32 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "hops" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring + , conduit, conduit-extra, containers, deepseq, directory, filepath + , http-conduit, http-types, optparse-applicative, parallel + , QuickCheck, text, transformers, vector + }: + mkDerivation { + pname = "hops"; + version = "0.0.2"; + sha256 = "7ab9d30dd91fa70be0ffc73d0259f4d6ae330a3a941c9767818782ffa07a3ad8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-terminal attoparsec base bytestring conduit + conduit-extra containers deepseq directory filepath http-conduit + http-types optparse-applicative parallel text transformers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq QuickCheck text + vector + ]; + homepage = "http://github.com/akc/hops"; + description = "Hackable Operations on Power Series"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hoq" = callPackage ({ mkDerivation, alex, array, base, bifunctors, bytestring , filepath, happy, mtl, pretty, readline, void @@ -71943,8 +72460,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.5.4"; - sha256 = "aaa707242dd380e355527360e0492e913ae1883e02fd942734e37458384012be"; + version = "0.7.0"; + sha256 = "0fb66876b61d665d27f37a2bcbc7c8c2601caec6221d754e9a871311591f6983"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72101,26 +72618,28 @@ self: { ]; description = "Code Coverage Library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpc-coveralls" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, cmdargs + ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process - , pureMD5, regex-posix, retry, safe, split + , pureMD5, regex-posix, retry, safe, split, transformers }: mkDerivation { pname = "hpc-coveralls"; - version = "0.9.0"; - sha256 = "0601c2f7ed840df815715d00a977c20796a9fd59b0890ada8e13d539c7016a46"; + version = "1.0.1"; + sha256 = "9fad1644415319762d298bcacd2e4d6f17c4b19e53025f4ba583f7ebbec27b6a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cmdargs containers curl directory - directory-tree hpc process pureMD5 retry safe split + aeson base bytestring Cabal cmdargs containers curl directory + directory-tree hpc process pureMD5 retry safe split transformers ]; executableHaskellDepends = [ - aeson async base bytestring cmdargs containers curl directory + aeson async base bytestring Cabal cmdargs containers curl directory directory-tree hpc process pureMD5 regex-posix retry safe split + transformers ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; @@ -72213,6 +72732,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hpp" = callPackage + ({ mkDerivation, base, directory, filepath, time }: + mkDerivation { + pname = "hpp"; + version = "0.1.0.0"; + sha256 = "f1c2645cb7ee681bf1d6a02ea0f98c3fc2fe880fd408ff3dd1870d817197d736"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath time ]; + executableHaskellDepends = [ base directory filepath time ]; + homepage = "https://github.com/acowley/hpp"; + description = "A Haskell pre-processor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hpqtypes" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-default-class, exceptions, HUnit, lifted-base, monad-control @@ -72241,6 +72775,7 @@ self: { homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) postgresql;}; "hprotoc" = callPackage @@ -72250,8 +72785,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.1.5"; - sha256 = "463ce252cbcf6246bb80cc30efa14580b5370e8e5c5c83debfe1b24833b52353"; + version = "2.1.6"; + sha256 = "a2eeff72064c8edae02700e76dc5b37eec5a9bb080a562ac71ea1e4ffca099ef"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72360,6 +72895,7 @@ self: { homepage = "https://github.com/ccasin/hpuz"; description = "Haskell bindings for libpuz"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hpygments" = callPackage @@ -72433,6 +72969,7 @@ self: { homepage = "http://github.com/paulrzcz/hquantlib.git"; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "hquery" = callPackage @@ -72516,6 +73053,7 @@ self: { jailbreak = true; description = "Embed a Ruby intepreter in your Haskell program !"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) ruby;}; "hs-GeoIP" = callPackage @@ -72656,6 +73194,7 @@ self: { homepage = "https://github.com/myfreeweb/hs-duktape"; description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-excelx" = callPackage @@ -73249,6 +73788,7 @@ self: { ]; description = "Backend for uploading benchmark data to Google Fusion Tables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "hsc2hs" = callPackage @@ -73298,6 +73838,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-auditor"; description = "Haskell SuperCollider Auditor"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsc3-cairo" = callPackage @@ -73576,6 +74117,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile"; description = "Haskell SuperCollider SoundFile"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsc3-unsafe" = callPackage @@ -73817,6 +74359,7 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsdif" = callPackage @@ -73858,6 +74401,7 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {inherit (pkgs) adns;}; "hsdns-cache" = callPackage @@ -73916,6 +74460,7 @@ self: { homepage = "http://github.com/peti/hsemail"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hsemail-ns" = callPackage @@ -73993,6 +74538,7 @@ self: { testHaskellDepends = [ base binary bytestring containers hspec HUnit iconv text time ]; + jailbreak = true; homepage = "https://github.com/emmanueltouzery/hsexif"; description = "EXIF handling library in pure Haskell"; license = stdenv.lib.licenses.bsd3; @@ -74406,6 +74952,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile;}; "hsndfile-storablevector" = callPackage @@ -74431,6 +74978,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Hsndfile"; description = "Haskell bindings for libsndfile (Data.Vector interface)"; license = stdenv.lib.licenses.lgpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsnock" = callPackage @@ -74802,6 +75350,7 @@ self: { homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-experimental" = callPackage @@ -74945,6 +75494,7 @@ self: { 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-structured-formatter" = callPackage @@ -75225,6 +75775,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -75255,6 +75806,7 @@ self: { homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl"; description = "HsQML DataModel instances for Vinyl Rec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsqml-demo-morris" = callPackage @@ -75293,6 +75845,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsqml-demo-samples" = callPackage @@ -75367,6 +75920,7 @@ self: { homepage = "http://www.volker-wysk.de/hsshellscript/"; description = "Haskell for Unix shell scripting tasks"; license = "LGPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hssourceinfo" = callPackage @@ -75665,7 +76219,6 @@ self: { homepage = "http://www.happstack.com/"; description = "hsp+jmacro support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsx-xhtml" = callPackage @@ -75724,6 +76277,7 @@ self: { homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "hszephyr" = callPackage @@ -76141,8 +76695,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.20"; - sha256 = "8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24"; + version = "0.4.21"; + sha256 = "f6465cfec946c7acfeb210daa97e65e67c3924867072ed47193a83cf1226dc30"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -76613,6 +77167,7 @@ self: { homepage = "https://github.com/fpco/http-reverse-proxy"; description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "http-server" = callPackage @@ -76862,6 +77417,7 @@ self: { homepage = "http://tomahawkins.org"; description = "A two player abstract strategy game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hub" = callPackage @@ -77021,8 +77577,8 @@ self: { }: mkDerivation { pname = "hunch"; - version = "0.1.1"; - sha256 = "2b959733b68066abcb8bddfb982c859b772070c2a16f27d183f1c61028817bae"; + version = "0.2.0"; + sha256 = "52e214b7b9af8fed9735ab65d1c241f2f11204909b4b29345054557dfd236331"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -77884,6 +78440,7 @@ self: { homepage = "https://github.com/rrnewton/hydra-print"; description = "NCurses interface to view multiple ByteString streams in parallel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hydrogen" = callPackage @@ -78476,6 +79033,7 @@ self: { stm tagged tasty template-haskell temporary test-framework test-framework-hunit text unix utf8-string ]; + jailbreak = true; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; }) {}; @@ -78532,7 +79090,6 @@ self: { ]; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ideas" = callPackage @@ -78665,16 +79222,16 @@ self: { ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint , base, base64-bytestring, binary, blaze-html, blaze-markup , bytestring, cheapskate, containers, deepseq, directory, filepath - , fingertree, haskeline, lens, libffi, mtl, network - , optparse-applicative, parsers, pretty, process, safe, split, text - , time, transformers, transformers-compat, trifecta, uniplate, unix + , fingertree, haskeline, libffi, mtl, network, optparse-applicative + , parsers, pretty, process, safe, split, text, time, transformers + , transformers-compat, trifecta, uniplate, unix , unordered-containers, utf8-string, vector - , vector-binary-instances, xml, zip-archive, zlib + , vector-binary-instances, zip-archive, zlib }: mkDerivation { pname = "idris"; - version = "0.9.18.1"; - sha256 = "48569f1135af66e2bce22379acf347ab67bb12cff98065043d82f4262d9ea475"; + version = "0.9.19"; + sha256 = "1525b7e9c716d1d09520b8e6cb599dad24ced6161e01a4c864fd7fc636405ff3"; configureFlags = [ "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -78682,10 +79239,10 @@ self: { annotated-wl-pprint ansi-terminal ansi-wl-pprint base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree - haskeline lens libffi mtl network optparse-applicative parsers - pretty process safe split text time transformers - transformers-compat trifecta uniplate unix unordered-containers - utf8-string vector vector-binary-instances xml zip-archive zlib + haskeline libffi mtl network optparse-applicative parsers pretty + process safe split text time transformers transformers-compat + trifecta uniplate unix unordered-containers utf8-string vector + vector-binary-instances zip-archive zlib ]; executableHaskellDepends = [ base directory filepath haskeline transformers @@ -78753,6 +79310,18 @@ self: { license = "GPL"; }) {}; + "ifcxt" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "ifcxt"; + version = "0.1.0.0"; + sha256 = "7c09ff72dc72b288bb2020970adabc87ef1e5913175a745dd1573faf3422169d"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/mikeizbicki/ifcxt"; + description = "put if statements within type constraints"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "iff" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -78790,8 +79359,8 @@ self: { }: mkDerivation { pname = "ig"; - version = "0.4"; - sha256 = "ed03d66cd64476c6f0065251ad777cdbfb62a740802007218dd24f732fcf723e"; + version = "0.5.1"; + sha256 = "1e97b3de79b9d78b32b74dbb1ab70451f7be544979fee90fb61d099b992b60e8"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit conduit-extra crypto-api cryptohash cryptohash-cryptoapi data-default @@ -78888,8 +79457,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.7.0.3"; - sha256 = "f2df05336dae36d05ffb25f993fab51ccb727f83adb290b83ab251384e8b2e80"; + version = "0.7.1.0"; + sha256 = "d36584780949283a606086837abe4d2948d9be6aef01591242b34b4499fded90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78915,7 +79484,6 @@ self: { homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -78932,7 +79500,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-basic" = callPackage @@ -78945,7 +79512,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-blaze" = callPackage @@ -78958,7 +79524,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-charts" = callPackage @@ -78976,7 +79541,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-diagrams" = callPackage @@ -79007,7 +79571,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-hatex" = callPackage @@ -79020,6 +79583,24 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; + }) {}; + + "ihaskell-inline-r" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , filepath, ihaskell, ihaskell-blaze, inline-r, template-haskell + , temporary + }: + mkDerivation { + pname = "ihaskell-inline-r"; + version = "0.1.0.0"; + sha256 = "d2db68091c07fa021dc9bde2468c0cbff950198481476f8e269e34f6ccc000a5"; + libraryHaskellDepends = [ + base base64-bytestring blaze-html bytestring filepath ihaskell + ihaskell-blaze inline-r template-haskell temporary + ]; + homepage = "https://tweag.github.io/HaskellR/"; + description = "Embed R quasiquotes and plots in IHaskell notebooks"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -79036,7 +79617,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-magic" = callPackage @@ -79054,7 +79634,6 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-parsec" = callPackage @@ -79072,7 +79651,6 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Parsec"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-plot" = callPackage @@ -79085,7 +79663,7 @@ self: { homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ihaskell-rlangqq" = callPackage @@ -79103,7 +79681,6 @@ self: { ]; description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-widgets" = callPackage @@ -79125,6 +79702,7 @@ self: { homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IPython standard widgets for IHaskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihttp" = callPackage @@ -79223,6 +79801,7 @@ self: { jailbreak = true; description = "bindings to imagemagick library"; license = "unknown"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) imagemagick;}; "imagepaste" = callPackage @@ -79740,6 +80319,7 @@ self: { homepage = "https://github.com/myfreeweb/indieweb-algorithms"; description = "A collection of implementations of IndieWeb algorithms"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "infer-upstream" = callPackage @@ -79920,11 +80500,12 @@ self: { ({ mkDerivation, attoparsec, base, text, unordered-containers }: mkDerivation { pname = "ini"; - version = "0.3.1"; - sha256 = "0bfb1860a37cbd5652da1914b114ecb242726366442e9f03cf75f4e622713c06"; + version = "0.3.2"; + sha256 = "63e7860208999ec7142b227964bf12cd0c9ff69aa99a6e651746332307aa7d30"; libraryHaskellDepends = [ attoparsec base text unordered-containers ]; + homepage = "http://github.com/chrisdone/ini"; description = "Quick and easy configuration files in the INI format"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -80038,6 +80619,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inline-r" = callPackage + ({ mkDerivation, aeson, base, bytestring, c2hs, data-default-class + , deepseq, directory, exceptions, filepath, ieee754, mtl, pretty + , primitive, process, quickcheck-assertions, R, setenv, silently + , singletons, strict, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, text, th-lift + , th-orphans, transformers, unix, vector + }: + mkDerivation { + pname = "inline-r"; + version = "0.7.0.0"; + sha256 = "27f4ed2cf94402c86126417f98039bae4cb8a0fb24b4488fd4368b626fc6d36a"; + libraryHaskellDepends = [ + aeson base bytestring data-default-class deepseq exceptions mtl + pretty primitive process setenv singletons template-haskell text + th-lift th-orphans transformers unix vector + ]; + libraryPkgconfigDepends = [ R ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring directory filepath ieee754 mtl process + quickcheck-assertions silently singletons strict tasty tasty-golden + tasty-hunit tasty-quickcheck template-haskell temporary text unix + vector + ]; + jailbreak = true; + description = "Seamlessly call R from Haskell and vice versa. No FFI required."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) R;}; + "inquire" = callPackage ({ mkDerivation, aether, base, text }: mkDerivation { @@ -80222,6 +80834,7 @@ self: { libraryHaskellDepends = [ ghc-prim ]; description = "Integer library based on GMP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-pure" = callPackage @@ -80722,6 +81335,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ioref-stable" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ioref-stable"; + version = "0.1.0.0"; + sha256 = "9044897340c044e44d3a9c33b350523147a6a95a2f1c8fb410caee880ceba314"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/cocreature/ioref-stable#readme"; + description = "iorefs with a unique stable index"; + license = stdenv.lib.licenses.mit; + }) {}; + "iothread" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -80867,10 +81492,10 @@ self: { }: mkDerivation { pname = "iproute"; - version = "1.5.0"; - sha256 = "e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557"; + version = "1.6.0"; + sha256 = "792c638d4957ac85d04a17864991eaa4ae09e4fb7e890ff95a7807a2875705d0"; revision = "1"; - editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8"; + editedCabalFile = "ffba769f859a5853a5faaf07c86ff93759aff36e80bf8ba1c2cbc86c3811d01a"; libraryHaskellDepends = [ appar base byteorder containers network ]; @@ -80932,18 +81557,18 @@ self: { "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers - , directory, filepath, mtl, parsec, SHA, tar, text, transformers - , uuid, zeromq4-haskell + , directory, filepath, mtl, parsec, process, SHA, temporary, text + , transformers, uuid, zeromq4-haskell }: mkDerivation { pname = "ipython-kernel"; - version = "0.7.0.0"; - sha256 = "17acfb6ac18e23a85b3fe3324af946439bf0bd886eaf5613d94c027a903174d7"; + version = "0.8.0.0"; + sha256 = "b5c762842b79536bdb405134de22219198215c4b8634d23372354b035308215d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cereal containers directory filepath mtl SHA - tar text transformers uuid zeromq4-haskell + aeson base bytestring cereal containers directory filepath mtl + process SHA temporary text transformers uuid zeromq4-haskell ]; executableHaskellDepends = [ base filepath mtl parsec text transformers @@ -81039,8 +81664,8 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "1.1.1"; - sha256 = "9f8e78db1aacf1e74df042e951335277be5bf25e01d1206d119470b451dcd2eb"; + version = "1.1.2"; + sha256 = "1daeb48fb0ec3eddd4cbdfd8b1d3e555e276f58439d583f5286ad2b35faf3928"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81256,6 +81881,7 @@ self: { executableHaskellDepends = [ base gtk3 ]; description = "A program to show the size of image and whether suitable for wallpaper"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "islink" = callPackage @@ -81389,6 +82015,7 @@ self: { base heap HUnit iteratee ListLike mtl statistics test-framework test-framework-hunit test-framework-quickcheck2 vector ]; + jailbreak = true; homepage = "https://github.com/JohnLato/iter-stats"; description = "iteratees for statistical processing"; license = stdenv.lib.licenses.bsd3; @@ -81849,6 +82476,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ja-base-extra" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ja-base-extra"; + version = "0.1.0.0"; + sha256 = "da7fb172ae72672ab42b50631f9d03ea00c4c9f5607db890f6cd0d389a7bde4b"; + libraryHaskellDepends = [ base ]; + description = "Extra functions I require in base"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jack" = callPackage ({ mkDerivation, array, base, bytestring, enumset, event-list , explicit-exception, libjack2, midi, non-negative, transformers @@ -81868,6 +82506,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/JACK"; description = "Bindings for the JACK Audio Connection Kit"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -81942,6 +82581,7 @@ self: { homepage = "http://github.com/peti/jailbreak-cabal"; description = "Strip version restrictions from build dependencies in Cabal files"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "jalaali" = callPackage @@ -81989,10 +82629,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.0.1"; - sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1"; - revision = "1"; - editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6"; + version = "0.5.0.2"; + sha256 = "2d633a0410423ad12840449bb809f3bc3ffbc9aae7db6b365379b02ebeb3829c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82005,7 +82643,6 @@ self: { homepage = "https://github.com/mtolly/jammittools"; description = "Export sheet music and audio from Windows/Mac app Jammit"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jarfind" = callPackage @@ -82422,6 +83059,7 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "jpeg" = callPackage @@ -82492,6 +83130,7 @@ self: { ]; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jsaddle-hello" = callPackage @@ -82507,6 +83146,7 @@ self: { homepage = "https://github.com/ghcjs/jsaddle-hello"; description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jsc" = callPackage @@ -82807,6 +83447,7 @@ self: { scientific test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/grayjay/json-rpc-client"; description = "JSON-RPC 2.0 on the client side."; license = stdenv.lib.licenses.mit; @@ -82830,6 +83471,7 @@ self: { aeson base bytestring HUnit mtl test-framework test-framework-hunit text unordered-containers vector ]; + jailbreak = true; homepage = "https://github.com/grayjay/json-rpc-server"; description = "JSON-RPC 2.0 on the server side."; license = stdenv.lib.licenses.mit; @@ -82875,23 +83517,24 @@ self: { }) {}; "json-stream" = callPackage - ({ mkDerivation, aeson, base, bytestring, hspec, scientific, text - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, directory, hspec + , scientific, text, unordered-containers, vector }: mkDerivation { pname = "json-stream"; - version = "0.3.1.0"; - sha256 = "0de2f4abe549c2bee7bdb13e9bdd70137a06140e3b390ad3697a16a7d34ce7c6"; + version = "0.3.2.2"; + sha256 = "4415147dec300d1121121308008a522de79949549c35b23c673d70717ad28029"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring hspec scientific text unordered-containers - vector + aeson base bytestring directory hspec scientific text + unordered-containers vector ]; homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-togo" = callPackage @@ -83070,8 +83713,8 @@ self: { }: mkDerivation { pname = "jsonsql"; - version = "0.1.0.1"; - sha256 = "3906445e73a38fadc36dcbaf927597797f0ecd3c6310acf63c48fdab79eb24d7"; + version = "0.1.2.1"; + sha256 = "93234e108034457f59e078cd2d6205a7ed4218262f0c7a39a91600e915b7966b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83163,6 +83806,7 @@ self: { executableToolDepends = [ alex ]; description = "A first-order reasoning toolbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "jumpthefive" = callPackage @@ -83263,6 +83907,7 @@ self: { homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "kan-extensions" = callPackage @@ -83741,6 +84386,7 @@ self: { homepage = "http://www.keera.es/blog/community/"; description = "Haskell on Rails - Reactive Fields for WX widgets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "keera-hails-reactive-yampa" = callPackage @@ -83861,6 +84507,7 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Web application deployment manager, focusing on Haskell web frameworks"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "kevin" = callPackage @@ -84177,6 +84824,7 @@ self: { homepage = "http://github.com/alpmestan/kmeans-vector"; description = "An implementation of the kmeans clustering algorithm based on the vector package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "knob" = callPackage @@ -84345,6 +84993,7 @@ self: { libraryHaskellDepends = [ base gamma random-fu roots vector ]; description = "Kolmogorov distribution and Kolmogorov-Smirnov test"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ktx" = callPackage @@ -84358,6 +85007,7 @@ self: { homepage = "https://github.com/corngood/ktx"; description = "A binding for libktx from Khronos"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {egl = null; inherit (pkgs) glew;}; "kure" = callPackage @@ -84541,6 +85191,7 @@ self: { homepage = "http://github.com/jfischoff/lagrangian"; description = "Solve Lagrange multiplier problems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "laika" = callPackage @@ -84602,6 +85253,7 @@ self: { jailbreak = true; description = "Educational drawing canvas for FP explorers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lambda-devs" = callPackage @@ -84752,6 +85404,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; }) {}; "lambdabot-core" = callPackage @@ -84778,6 +85431,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot core functionality"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-haskell-plugins" = callPackage @@ -84804,6 +85458,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot Haskell plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-irc-plugins" = callPackage @@ -84822,6 +85477,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "IRC plugins for lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-misc-plugins" = callPackage @@ -84845,6 +85501,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot miscellaneous plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-novelty-plugins" = callPackage @@ -84863,6 +85520,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Novelty plugins for Lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-reference-plugins" = callPackage @@ -84881,6 +85539,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Lambdabot reference plugins"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-social-plugins" = callPackage @@ -84897,6 +85556,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Social plugins for Lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdabot-trusted" = callPackage @@ -85333,6 +85993,7 @@ self: { base bytestring HUnit mainland-pretty srcloc symbol test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; @@ -85394,6 +86055,7 @@ self: { mtl parsec QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 uniplate wl-pprint ]; + jailbreak = true; homepage = "http://github.com/jswebtools/language-ecmascript"; description = "JavaScript parser and pretty-printer library"; license = stdenv.lib.licenses.bsd3; @@ -85618,6 +86280,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-lua2" = callPackage + ({ mkDerivation, base, containers, Earley, lexer-applicative + , microlens, optparse-applicative, QuickCheck, regex-applicative + , semigroups, srcloc, tasty, tasty-hunit, tasty-quickcheck + , transformers, unordered-containers, wl-pprint + }: + mkDerivation { + pname = "language-lua2"; + version = "0.1.0.2"; + sha256 = "047710b7b055110d773a878db1cf9ee74a05cff2df41ef849af8dd953ec3339d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers Earley lexer-applicative microlens + regex-applicative semigroups srcloc transformers + unordered-containers wl-pprint + ]; + executableHaskellDepends = [ + base Earley lexer-applicative optparse-applicative srcloc wl-pprint + ]; + testHaskellDepends = [ + base lexer-applicative QuickCheck semigroups srcloc tasty + tasty-hunit tasty-quickcheck unordered-containers + ]; + homepage = "http://github.com/mitchellwrosen/language-lua2"; + description = "Lua parser and pretty printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + }) {}; + "language-mixal" = callPackage ({ mkDerivation, base, mtl, parsec, pretty }: mkDerivation { @@ -85657,6 +86349,7 @@ self: { homepage = "https://github.com/peti/language-nix"; description = "Haskell AST and Parsers for the Nix language"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "language-objc" = callPackage @@ -85719,25 +86412,25 @@ self: { "language-puppet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers - , cryptohash, Diff, directory, either, exceptions, filecache, Glob - , hashable, hruby, hslogger, hslua, hspec, HUnit, lens, lens-aeson - , luautils, mtl, operational, optparse-applicative, parallel-io - , parsec, parsers, pcre-utils, process, regex-pcre-builtin - , scientific, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix + , cryptonite, Diff, directory, either, exceptions, filecache + , formatting, Glob, hashable, hruby, hslogger, hslua, hspec, HUnit + , lens, lens-aeson, memory, mtl, operational, optparse-applicative + , parallel-io, parsec, parsers, pcre-utils, process, random + , regex-pcre-builtin, scientific, servant, servant-client, split + , stm, strict-base-types, temporary, text, time, transformers, unix , unordered-containers, vector, yaml }: mkDerivation { pname = "language-puppet"; - version = "1.1.3.1"; - sha256 = "20593baf86959164fcea1d40e97f74c9bd43b851e38838451deceb71a9d6dfc0"; + version = "1.1.4"; + sha256 = "b131617644354e332fd1bc5eeec02f038abf5fb44b6e5d0d0485d9e622ea7800"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptohash directory either exceptions - filecache hashable hruby hslogger hslua lens lens-aeson luautils - mtl operational parsec parsers pcre-utils process + case-insensitive containers cryptonite directory either exceptions + filecache formatting hashable hruby hslogger hslua lens lens-aeson + memory mtl operational parsec parsers pcre-utils process random regex-pcre-builtin scientific servant servant-client split stm strict-base-types text time transformers unix unordered-containers vector yaml @@ -85808,6 +86501,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-qux" = callPackage + ({ mkDerivation, base, containers, either, indents, mtl, parsec + , pretty, transformers + }: + mkDerivation { + pname = "language-qux"; + version = "0.1.1.3"; + sha256 = "22e3263cbd3895e78739c650e7731b92a9de7c6894a8fc3defcd09994997477b"; + libraryHaskellDepends = [ + base containers either indents mtl parsec pretty transformers + ]; + homepage = "https://github.com/qux-lang/language-qux"; + description = "Utilities for working with the Qux language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-sh" = callPackage ({ mkDerivation, base, directory, filepath, mtl, parsec, pcre-light }: @@ -86243,6 +86953,7 @@ self: { homepage = "https://bitbucket.org/gchrupala/colada"; description = "Online Latent Dirichlet Allocation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ldap-client" = callPackage @@ -86283,6 +86994,7 @@ self: { base bytestring cmdargs containers filepath ]; testHaskellDepends = [ base HUnit ]; + jailbreak = true; homepage = "http://rampa.sk/static/ldif.html"; description = "The LDAP Data Interchange Format (LDIF) tools"; license = stdenv.lib.licenses.bsd3; @@ -86416,6 +87128,7 @@ self: { homepage = "https://github.com/mnacamura/learning-hmm"; description = "Yet another library for hidden Markov models"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "leetify" = callPackage @@ -86472,7 +87185,7 @@ self: { homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leksah-server" = callPackage @@ -86507,9 +87220,11 @@ self: { base conduit conduit-extra hslogger HUnit process resourcet transformers ]; + jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lendingclub" = callPackage @@ -86845,6 +87560,7 @@ self: { homepage = "http://github.com/kim/leveldb-haskell"; description = "Haskell bindings to LevelDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) leveldb;}; "leveldb-haskell-fork" = callPackage @@ -86886,6 +87602,7 @@ self: { homepage = "https://github.com/basvandijk/levmar"; description = "An implementation of the Levenberg-Marquardt algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "levmar-chart" = callPackage @@ -87146,6 +87863,7 @@ self: { homepage = "https://github.com/peddie/libconfig-haskell"; description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {config = null;}; "libcspm" = callPackage @@ -87343,8 +88061,8 @@ self: { }: mkDerivation { pname = "libmpd"; - version = "0.9.0.3"; - sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6"; + version = "0.9.0.4"; + sha256 = "bdaa57a410396b2f02ddb9896823ce0a176751fa84261f445e9a5b7671333a7a"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class filepath mtl network old-locale text time utf8-string @@ -87353,6 +88071,7 @@ 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; @@ -87501,6 +88220,7 @@ self: { homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libssh2; ssh2 = null;}; "libssh2-conduit" = callPackage @@ -87575,6 +88295,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -87689,6 +88410,7 @@ self: { homepage = "http://github.com/sproingie/haskell-cells/"; description = "Conway's Life cellular automaton"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lifted-async" = callPackage @@ -87726,6 +88448,7 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; + jailbreak = true; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; @@ -87894,6 +88617,7 @@ self: { libraryHaskellDepends = [ base hmatrix HUnit ]; description = "LINear Discriminant Analysis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lindenmayer" = callPackage @@ -88015,6 +88739,7 @@ self: { homepage = "http://hub.darcs.net/thielema/linear-circuit"; description = "Compute resistance of linear electrical circuits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linear-grammar" = callPackage @@ -88059,6 +88784,7 @@ self: { homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linear-vect" = callPackage @@ -88090,8 +88816,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { pname = "linearscan"; - version = "0.9.0"; - sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2"; + version = "0.11"; + sha256 = "436317b4faf5497aa0c9488ba987a72aff1a899dc32198dc9154572416ad8276"; libraryHaskellDepends = [ base containers ghc-prim mtl transformers ]; @@ -88108,8 +88834,8 @@ self: { }: mkDerivation { pname = "linearscan-hoopl"; - version = "0.9.2"; - sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b"; + version = "0.11.1"; + sha256 = "3cb31c19f1915f5c861554004be3bedf8c2bff157f3f6dcbdbc99f47c0582d67"; libraryHaskellDepends = [ base containers free hoopl linearscan QuickCheck transformers ]; @@ -88273,6 +88999,7 @@ self: { homepage = "https://github.com/redneb/linux-file-extents"; description = "Retrieve file fragmentation information under Linux"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-inotify" = callPackage @@ -88310,6 +89037,7 @@ self: { homepage = "https://github.com/tensor5/linux-mount"; description = "Mount and unmount filesystems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-namespaces" = callPackage @@ -88322,6 +89050,7 @@ self: { homepage = "https://github.com/redneb/hs-linux-namespaces"; description = "Create new or enter an existing linux namespaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "linux-perf" = callPackage @@ -88440,6 +89169,7 @@ self: { ]; description = "Labeled File System interface for LIO"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lio-simple" = callPackage @@ -88483,9 +89213,9 @@ self: { "liquid-fixpoint" = callPackage ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors , bytestring, cmdargs, containers, deepseq, directory, filemanip - , filepath, ghc-prim, hashable, intern, mtl, parsec, pretty + , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format - , transformers, unordered-containers + , transformers, unordered-containers, z3 }: mkDerivation { pname = "liquid-fixpoint"; @@ -88493,6 +89223,7 @@ self: { sha256 = "7414b580a3ec8185da5e5148b46cef5d15e347080eb2561fcd228c72e7669816"; revision = "2"; editedCabalFile = "10397e387d91256dcd35cae36cb27ae302418c3c80da6e65d417657783beaf6b"; + configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88506,14 +89237,16 @@ self: { deepseq directory filepath hashable mtl parsec pretty process syb text text-format unordered-containers ]; + executableSystemDepends = [ ocaml ]; testHaskellDepends = [ base directory filepath process tasty tasty-hunit tasty-rerun text ]; + testSystemDepends = [ z3 ]; homepage = "https://github.com/ucsd-progsys/liquid-fixpoint"; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + }) {inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors @@ -88522,7 +89255,7 @@ self: { , ghc-paths, hashable, hpc, hscolour, intern, liquid-fixpoint, mtl , optparse-applicative, parsec, pretty, process, stm, syb, tagged , tasty, tasty-hunit, tasty-rerun, template-haskell, text, time - , transformers, unordered-containers, vector + , transformers, unordered-containers, vector, z3 }: mkDerivation { pname = "liquidhaskell"; @@ -88548,11 +89281,12 @@ self: { base containers directory filepath mtl optparse-applicative process stm tagged tasty tasty-hunit tasty-rerun transformers ]; + testSystemDepends = [ z3 ]; homepage = "http://goto.ucsd.edu/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + }) {inherit (pkgs) z3;}; "lispparser" = callPackage ({ mkDerivation, base, parsec }: @@ -89097,6 +89831,8 @@ self: { pname = "llvm-general-pure"; version = "3.4.5.4"; sha256 = "c54ab339f99284222bca1f8e56db701d2981eaf02728529476b818190671844d"; + revision = "1"; + editedCabalFile = "e8c807d23766b51761a9e039e6e6ae4d0a155f1c4054fbe81eddd9f66fb5dd4c"; libraryHaskellDepends = [ base containers mtl parsec setenv template-haskell transformers transformers-compat @@ -89174,8 +89910,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.4.0.0"; - sha256 = "6d757a9929a0b43f3e22d0799939d7489b16dd2637553bb396a47cd0318bf23f"; + version = "0.4.0.1"; + sha256 = "637506a2356076fefbf7515baa4c19ef2828fc404ab3c0ae0f9b1b2d5f04a42b"; libraryHaskellDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -89263,6 +89999,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-lmdb"; description = "Lightning MDB bindings"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lmdb;}; "load-env" = callPackage @@ -89327,6 +90064,7 @@ self: { homepage = "http://github.com/gridaphobe/located-base"; description = "Location-aware variants of partial functions"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; }) {}; "locators" = callPackage @@ -89427,8 +90165,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.2.4"; - sha256 = "56f3e654199a547551faa93fe8a97e2f3d7412bd3c20c5dd2b3c1eac9947d5b5"; + version = "0.3.1"; + sha256 = "6239019b513145e0e8117dff2deaca0a85c9f36f0419c892c7c93def98624b0e"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq exceptions hpqtypes lifted-base monad-control monad-time mtl @@ -89438,6 +90176,7 @@ self: { homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "log-domain" = callPackage @@ -89448,8 +90187,8 @@ self: { }: mkDerivation { pname = "log-domain"; - version = "0.10.2"; - sha256 = "e431fe38c30c87fbade98507e9ac42bf6749cb5faa583748f50cf0b768ec216d"; + version = "0.10.2.1"; + sha256 = "174045ba21aa787db043e8b592bb74906da2290e14c2469f9fb1e07bb760f11c"; libraryHaskellDepends = [ base binary bytes cereal comonad deepseq distributive hashable hashable-extras safecopy semigroupoids semigroups vector @@ -89458,7 +90197,6 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -89575,6 +90313,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "logic-TPTP" = callPackage @@ -89741,12 +90480,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lookup-tables" = callPackage + ({ mkDerivation, base, primitive, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "lookup-tables"; + version = "0.1.1.1"; + sha256 = "bb9ee2cea827e146d510804c6b26c6f1a62032215eba4da7eb5bb67f977c478e"; + libraryHaskellDepends = [ base primitive template-haskell ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "http://hub.darcs.net/jmcarthur/lookup-tables/issues"; + description = "Statically generate lookup tables using Template Haskell"; + license = stdenv.lib.licenses.isc; + }) {}; + "loop" = callPackage ({ mkDerivation, base, hspec, mtl }: mkDerivation { pname = "loop"; - version = "0.2.0"; - sha256 = "bd6c3cf86ab4b2ce801ec4eb069647dc2cb79dd7d08516e92c7ea647a1c22e86"; + version = "0.3.0"; + sha256 = "92962010bdab28cc0092dd3fe42819d6f215c717dd10d9349626d92a0d0b3ecf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec mtl ]; homepage = "https://github.com/nh2/loop"; @@ -89788,6 +90542,8 @@ self: { pname = "loops"; version = "0.2.0.2"; sha256 = "47cfc98476c1a3267b27531825849978d3c0ccb5a2d6cd61132a7f719f10ddeb"; + revision = "1"; + editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce"; libraryHaskellDepends = [ base primitive transformers vector ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; description = "Fast imperative-style loops"; @@ -90070,6 +90826,7 @@ self: { homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ltl" = callPackage @@ -90374,6 +91131,7 @@ self: { homepage = "https://github.com/fizruk/lxc"; description = "High level Haskell bindings to LXC (Linux containers)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lye" = callPackage @@ -90421,9 +91179,11 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; homepage = "https://github.com/hvr/lzma"; description = "LZMA/XZ compression and decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {inherit (pkgs) lzma;}; "lzma-clib" = callPackage @@ -90498,9 +91258,11 @@ self: { base bytestring HUnit io-streams QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/hvr/lzma-streams"; description = "IO-Streams interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "maam" = callPackage @@ -90747,7 +91509,7 @@ self: { homepage = "http://hub.darcs.net/thielema/magico"; description = "Compute solutions for Magico puzzle"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "magma" = callPackage @@ -91372,8 +92134,8 @@ self: { }: mkDerivation { pname = "mandrill"; - version = "0.3.0.0"; - sha256 = "f497b16900ead8851bec4d8529dfa2a0ba77397a8e7f95ef39d68928d64ffc09"; + version = "0.4.0.0"; + sha256 = "495c8e1863140df809275f1972ec0b2514d78790650a68413c7bf103780205a5"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-html bytestring containers email-validate http-client http-client-tls http-types lens mtl @@ -91465,7 +92227,7 @@ self: { homepage = "https://github.com/leftaroundabout/manifolds"; description = "Working with manifolds in a direct, embedding-free way"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "map-syntax" = callPackage @@ -91858,6 +92620,7 @@ self: { homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "mathblog" = callPackage @@ -92163,6 +92926,7 @@ self: { jailbreak = true; homepage = "http://www.cas.mcmaster.ca/~anand/"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mcmc-samplers" = callPackage @@ -92560,8 +93324,8 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.8"; - sha256 = "7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de"; + version = "0.9"; + sha256 = "85eeaeca4a4e76d2045028e31056d1bcecb6622eb1bf7d792807c6f51bac4cdf"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; @@ -92808,17 +93572,18 @@ self: { }) {}; "mfsolve" = callPackage - ({ mkDerivation, base, hashable, tasty, tasty-hunit + ({ mkDerivation, base, hashable, mtl, tasty, tasty-hunit , unordered-containers }: mkDerivation { pname = "mfsolve"; - version = "0.1.0"; - sha256 = "ef292b5b98c02cc826ffd81ad4151296ecebd18c5098b87a82bb3ad8a91d7dd3"; - libraryHaskellDepends = [ base hashable unordered-containers ]; + version = "0.3.0"; + sha256 = "a49b8c7900ee2ef4fe5906311171e7d49a0b50a4257266dccc6d6506e476db8c"; + libraryHaskellDepends = [ base hashable mtl unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Equation solver and calculator à la metafont"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mgeneric" = callPackage @@ -92865,24 +93630,26 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html - , blaze-markup, bytestring, containers, data-default, either, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, streaming-commons, stringable, template-haskell, text - , time, transformers, unordered-containers, vector, wai-extra, warp - , xml-lens, xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base + , blaze-html, blaze-markup, bytestring, containers, data-default + , either, errors, hspec, hspec-expectations-pretty-diff + , html-conduit, lens-aeson, mtl, network, network-uri, options + , pcre-heavy, raw-strings-qq, safe, scotty, streaming-commons + , stringable, template-haskell, text, time, transformers + , unordered-containers, vector, wai-extra, warp, xml-lens + , xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.2"; - sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9"; + version = "1.0.1.3"; + sha256 = "68f0da066f3c891ab15a4336eede0558f5f43dd74a70f178886e517a1fdd604f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-qq base blaze-markup bytestring containers data-default - either html-conduit lens-aeson network-uri pcre-heavy safe text - time transformers unordered-containers vector xml-lens xss-sanitize + aeson aeson-qq attoparsec base blaze-markup bytestring containers + data-default either errors html-conduit lens-aeson network-uri + pcre-heavy safe text time transformers unordered-containers vector + xml-lens xss-sanitize ]; executableHaskellDepends = [ aeson aeson-pretty base blaze-html blaze-markup data-default @@ -92920,11 +93687,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.3.3.0"; - sha256 = "42a4b7c40a02a500419cf4b18df97ca76f31db06b1947d9c7d7434daf6434eab"; + version = "0.3.4.1"; + sha256 = "95725872270774d20e85e12639e3d0636f6ed6ede977dae67da168ba67baa1f9"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; - description = "A tiny part of the lens library which you can depend upon"; + description = "A tiny part of the lens library with no dependencies"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -92945,13 +93712,13 @@ self: { ({ mkDerivation, array, base, bytestring, containers, microlens }: mkDerivation { pname = "microlens-ghc"; - version = "0.2.1.0"; - sha256 = "0f9544e355d4c262ee94eacc893b57ad54666e473a5e4b7cd7db236fcfdd9ea3"; + version = "0.3.0.0"; + sha256 = "d9bd1660bbfe8b988779c409e8fb770ebd57d0149a5b49002225033971dee67a"; libraryHaskellDepends = [ array base bytestring containers microlens ]; homepage = "http://github.com/aelve/microlens"; - description = "Orphan instances of microlens classes for packages coming with GHC (array, bytestring, containers)"; + description = "microlens + all features depending on packages coming with GHC (array, bytestring, containers)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -92977,8 +93744,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.1.3.0"; - sha256 = "8f2c08879fb484df0e1f2564dfa2e1fd6dd4745fefae02678e569803db97ad80"; + version = "0.1.4.0"; + sha256 = "14ff87d02c650ce3ca3a5ebe93f4e918883c4d42efc142d56ee4d96de18e07f6"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -93081,6 +93848,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -93101,6 +93869,7 @@ self: { homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-util" = callPackage @@ -93137,6 +93906,7 @@ self: { homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midisurface" = callPackage @@ -93259,7 +94029,6 @@ self: { jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime" = callPackage @@ -93297,8 +94066,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.9"; - sha256 = "641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0"; + version = "0.4.10"; + sha256 = "4930f9c6a906e73452a891d93b1cf545b64613ccb079fe625fa4c98c01b25677"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -93558,6 +94327,7 @@ self: { libraryHaskellDepends = [ async base ]; description = "A Haskell bundle of the Minisat SAT solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "ministg" = callPackage @@ -93654,6 +94424,7 @@ self: { homepage = "https://github.com/mokus0/misfortune"; description = "fortune-mod clone"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "missing-foreign" = callPackage @@ -94051,20 +94822,21 @@ self: { "moesocks" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring - , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl - , network, optparse-applicative, random, stm, strict, text, time - , transformers, unix, unordered-containers + , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens + , lens-aeson, mtl, network, optparse-applicative, random, stm + , strict, text, time, transformers, unix, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "0.1.0.26"; - sha256 = "6b2af22a46ffea53436cfca302ad526827c4bfd7963d259304714acd1ee2bf91"; + version = "0.1.2.30"; + sha256 = "e2e97bf36eb07f1f9813a695f78cf2eefb9f7e25a0046b5655abbc02bc05b590"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash - hslogger HsOpenSSL iproute lens mtl network optparse-applicative - random stm strict text time transformers unix unordered-containers + hslogger HsOpenSSL iproute lens lens-aeson mtl network + optparse-applicative random stm strict text time transformers unix + unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; @@ -94095,6 +94867,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mole" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring + , containers, cryptohash, css-syntax, directory, filemanip + , filepath, fsnotify, hspec, hspec-smallcheck, kraken, mtl + , network-uri, optparse-applicative, process, smallcheck, snap + , snap-server, stm, tagsoup, text, time, transformers, unix + , unordered-containers, vector + }: + mkDerivation { + pname = "mole"; + version = "0.0.3"; + sha256 = "dd9dd149f4c5ce0e9e9bec0c75277b9a4fad51ff6a1545f0231ba94e0b51469e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + attoparsec base base64-bytestring bytestring containers cryptohash + css-syntax directory filemanip filepath fsnotify kraken mtl + network-uri optparse-applicative process snap snap-server stm + tagsoup text time transformers unix + ]; + testHaskellDepends = [ + attoparsec base bytestring containers hspec hspec-smallcheck kraken + smallcheck stm text time unordered-containers vector + ]; + description = "A glorified string replacement tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "monad-abort-fd" = callPackage ({ mkDerivation, base, data-default, monad-control, mtl , transformers, transformers-abort, transformers-base @@ -95076,8 +95876,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.0.6"; - sha256 = "d6b7699d98a9349b2711be23fce0c61fbf91b66e4625e937ca1b65c6b6f988c5"; + version = "2.0.7"; + sha256 = "ca0653656949b882f47e0b77fd8bc04b8437c94f114ebdf60544191ea6f9826d"; libraryHaskellDepends = [ array base binary bson bytestring containers cryptohash hashtables lifted-base monad-control mtl network parsec random random-shuffle @@ -95142,6 +95942,7 @@ self: { executableHaskellDepends = [ base filepath hinotify process ]; description = "Do things when files change"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mono-foldable" = callPackage @@ -95473,24 +96274,23 @@ self: { "morte" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq - , happy, http-client, http-client-tls, lens-family-core, managed - , optparse-applicative, pipes, system-fileio, system-filepath, text - , text-format, transformers + , happy, http-client, http-client-tls, managed, microlens + , microlens-mtl, optparse-applicative, pipes, system-fileio + , system-filepath, text, text-format, transformers }: mkDerivation { pname = "morte"; - version = "1.2.1"; - sha256 = "8fb0e54f4469de6ee9018ef51bf9ffda5dcd1abca4de87f9e47edc8b4199fb97"; + version = "1.3.0"; + sha256 = "bcaf4af883e8441dff551d05efcb82985051635fe1f38dc80be2fd5bf6471240"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ array base binary containers deepseq http-client http-client-tls - lens-family-core managed pipes system-fileio system-filepath text - text-format transformers + managed microlens microlens-mtl pipes system-fileio system-filepath + text text-format transformers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base optparse-applicative text ]; - jailbreak = true; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95884,6 +96684,7 @@ self: { homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl" = callPackage @@ -95950,6 +96751,7 @@ self: { homepage = "https://github.com/nikita-volkov/mtl-prelude"; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mtl-prelude" = callPackage @@ -96484,6 +97286,7 @@ self: { base base16-bytestring bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://github.com/plaprade/murmur3"; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; license = stdenv.lib.licenses.publicDomain; @@ -97195,17 +97998,15 @@ self: { "nagios-check" = callPackage ({ mkDerivation, base, bifunctors, exceptions, hspec, mtl - , nagios-perfdata, QuickCheck, text + , QuickCheck, text }: mkDerivation { pname = "nagios-check"; - version = "0.3.1"; - sha256 = "4c20ce048e51ea80ffb055e00374a91a98a9d9202ab302ec60b232e3851d9c9f"; - libraryHaskellDepends = [ - base bifunctors exceptions mtl nagios-perfdata text - ]; + version = "0.3.2"; + sha256 = "1bc9b85cb10c396943d53c44e2701c5bc2a02ecdf3e8f46da238981f8b7860b7"; + libraryHaskellDepends = [ base bifunctors exceptions mtl text ]; testHaskellDepends = [ base hspec QuickCheck text ]; - homepage = "https://github.com/fractalcat/haskell-nagios-check"; + homepage = "https://github.com/olorin/haskell-nagios-check"; description = "Package for writing monitoring plugins"; license = stdenv.lib.licenses.mit; }) {}; @@ -97421,6 +98222,7 @@ self: { jailbreak = true; description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage @@ -97497,8 +98299,8 @@ self: { }: mkDerivation { pname = "nationstates"; - version = "0.2.0.0"; - sha256 = "88e00660570f45c3ff709a659707b5967db54730f3dff25844dde07d0b3b3a1f"; + version = "0.3.0.0"; + sha256 = "2c4ec0d85f289f5bfef7a386995330d85164e9cf1d834a8ed39ae7a82df0ddd5"; libraryHaskellDepends = [ base bytestring clock containers http-client http-client-tls http-types multiset transformers xml @@ -97527,8 +98329,8 @@ self: { }: mkDerivation { pname = "nats-queue"; - version = "0.1.2.0"; - sha256 = "eee9a423a1ae8eb5fb4af05a98958e32a8b86f5bf8abeba0074afe7690c30f3f"; + version = "0.1.2.1"; + sha256 = "278abe19802ac26b2a720ad9bab84c9ce74f348eabff55ee96e67286f5453ca3"; libraryHaskellDepends = [ aeson async base bytestring containers dequeue network network-uri random text @@ -97695,6 +98497,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-ncurses/"; description = "Modernised bindings to GNU ncurses"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ncurses;}; "ndjson-conduit" = callPackage @@ -97732,13 +98535,12 @@ self: { }: mkDerivation { pname = "neat-interpolation"; - version = "0.2.2.1"; - sha256 = "de357ec4b78f68c5797d84e8bb01a35aff53e8c0d10d5d1ebbe5185d0483b303"; + version = "0.2.3"; + sha256 = "a60966321467bf8065796f37774756f94a89c443ee59fac4fbeac964d4a1c20b"; libraryHaskellDepends = [ base base-prelude parsec template-haskell ]; testHaskellDepends = [ base-prelude HTF ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/neat-interpolation"; description = "A quasiquoter for neat and simple multiline text interpolation"; license = stdenv.lib.licenses.mit; @@ -97797,6 +98599,7 @@ self: { ]; description = "Port of the NeHe OpenGL tutorials to Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "neil" = callPackage @@ -98089,6 +98892,7 @@ self: { homepage = "http://netlink-hs.googlecode.com/"; description = "Netlink communication for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "netlist" = callPackage @@ -98400,6 +99204,7 @@ self: { homepage = "http://www.leonmergen.com/opensource.html"; description = "Haskell API for Tor anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-api-support" = callPackage @@ -98441,6 +99246,7 @@ self: { homepage = "http://github.com/solatis/haskell-network-attoparsec"; description = "Utility functions for running a parser against a socket"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-bitcoin" = callPackage @@ -98641,14 +99447,15 @@ self: { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "network-house" = callPackage ({ mkDerivation, array, base, containers, mtl }: mkDerivation { pname = "network-house"; - version = "0.1.0.1"; - sha256 = "16bb57f41ffea2b7c181e42f8c9d6c7d0a7a6081ec70619ec049348bc4d53e69"; + version = "0.1.0.2"; + sha256 = "071fbc22fc516175e78235d9e29ccefd8eec7c3caa2e6de74dddf62cdbffab43"; libraryHaskellDepends = [ array base containers mtl ]; homepage = "https://github.com/nh2/network-house"; description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP"; @@ -98808,6 +99615,7 @@ self: { homepage = "https://john-millikin.com/software/haskell-xmpp/"; description = "Client library for the XMPP protocol"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "network-rpca" = callPackage @@ -99097,6 +99905,7 @@ self: { homepage = "https://github.com/tweag/network-transport-zeromq"; description = "ZeroMQ backend for network-transport"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "network-uri" = callPackage @@ -99271,6 +100080,7 @@ self: { sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; + jailbreak = true; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -99790,14 +100600,15 @@ self: { }: mkDerivation { pname = "not-gloss"; - version = "0.7.5.0"; - sha256 = "8b22f315fe60b95e7b24bae9b206b815851f5b60082cb5139ae2d33816f315e4"; + version = "0.7.6.0"; + sha256 = "0ac24214e36b7ab50e9e2714d0806a8f732a52d1b04d596438d9fdd6c877cd8b"; libraryHaskellDepends = [ base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw spatial-math time vector vector-binary-instances ]; description = "Painless 3D graphics, no affiliation with gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "not-gloss-examples" = callPackage @@ -100357,6 +101168,7 @@ self: { executableHaskellDepends = [ base bytestring mtl ncurses text ]; description = "Bored? Nyan cat!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "nylas" = callPackage @@ -100514,6 +101326,7 @@ self: { homepage = "https://github.com/fumieval/objective"; description = "Composable objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "observable-sharing" = callPackage @@ -100558,7 +101371,6 @@ self: { homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octopus" = callPackage @@ -100616,6 +101428,7 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -100959,14 +101772,15 @@ self: { "opaleye" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring - , case-insensitive, containers, contravariant, postgresql-simple - , pretty, product-profunctors, profunctors, QuickCheck, semigroups - , text, time, time-locale-compat, transformers, uuid, void + , case-insensitive, containers, contravariant, multiset + , postgresql-simple, pretty, product-profunctors, profunctors + , QuickCheck, semigroups, text, time, time-locale-compat + , transformers, uuid, void }: mkDerivation { pname = "opaleye"; - version = "0.4.0.0"; - sha256 = "3387a369f811a73d5a2be9b57827ade2a6275b56e4e02da365185e918befeeb7"; + version = "0.4.1.0"; + sha256 = "eca2210c89f76ddcc01c927d317fe58b212a446bffd3d61264a52056edcb91eb"; libraryHaskellDepends = [ attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -100974,14 +101788,33 @@ self: { uuid void ]; testHaskellDepends = [ - base containers contravariant postgresql-simple product-profunctors - profunctors QuickCheck semigroups time + base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups time ]; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye-classy" = callPackage + ({ mkDerivation, base, bytestring, lens, mtl, opaleye + , postgresql-simple, product-profunctors, transformers + }: + mkDerivation { + pname = "opaleye-classy"; + version = "0.3.1.1"; + sha256 = "2c3e216384bdb5e9e9eb84e67dd86b4daaf31568ccb5714b8aa84e2d3550ca9b"; + revision = "1"; + editedCabalFile = "79b08c58924ba2f19fa919f97895adb4dbb6b8e0b1644c91aaf5307e414fbc27"; + libraryHaskellDepends = [ + base bytestring lens mtl opaleye postgresql-simple + product-profunctors transformers + ]; + homepage = "https://github.com/benkolera/opaleye-classy/tree/master"; + description = "Opaleye wrapped up in classy MTL attire"; + license = stdenv.lib.licenses.mit; + }) {}; + "opaleye-sqlite" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring , case-insensitive, containers, contravariant, direct-sqlite @@ -101055,6 +101888,7 @@ self: { homepage = "https://github.com/emilaxelsson/open-typerep"; description = "Open type representations and dynamic types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "open-union" = callPackage @@ -101857,7 +102691,6 @@ self: { jailbreak = true; description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orchid" = callPackage @@ -101946,6 +102779,7 @@ self: { homepage = "http://github.com/ekmett/order-statistics/"; description = "L-Estimators for robust statistics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "ordered" = callPackage @@ -102500,6 +103334,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) pam;}; "panda" = callPackage @@ -102530,11 +103365,11 @@ self: { , directory, executable-path, extensible-exceptions, filemanip , filepath, haddock-library, highlighting-kate, hslua, HTTP , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl - , network, network-uri, old-time, pandoc-types, parsec, process - , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , texmath, text, time, unordered-containers, vector, xml, yaml - , zip-archive, zlib + , network, network-uri, old-locale, old-time, pandoc-types, parsec + , process, QuickCheck, random, scientific, SHA, syb, tagsoup + , temporary, test-framework, test-framework-hunit + , test-framework-quickcheck2, texmath, text, time + , unordered-containers, vector, xml, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; @@ -102548,9 +103383,10 @@ self: { bytestring cmark containers data-default deepseq-generics directory extensible-exceptions filemanip filepath haddock-library highlighting-kate hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA syb tagsoup temporary texmath text - time unordered-containers vector xml yaml zip-archive zlib + JuicyPixels mtl network network-uri old-locale old-time + pandoc-types parsec process random scientific SHA syb tagsoup + temporary texmath text time unordered-containers vector xml yaml + zip-archive zlib ]; executableHaskellDepends = [ aeson base bytestring containers directory extensible-exceptions @@ -102563,6 +103399,7 @@ self: { process QuickCheck syb test-framework test-framework-hunit test-framework-quickcheck2 text zip-archive ]; + jailbreak = true; homepage = "http://pandoc.org"; description = "Conversion between markup formats"; license = "GPL"; @@ -102626,8 +103463,8 @@ self: { pname = "pandoc-csv2table"; version = "1.0.1"; sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c"; - revision = "1"; - editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299"; + revision = "3"; + editedCabalFile = "4168dab7a87533c54ed9108ae6a65c71ec20642b85091d74b7dbf46b5c27b683"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; @@ -102803,6 +103640,7 @@ self: { jailbreak = true; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parallel" = callPackage @@ -103024,6 +103862,7 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -103237,18 +104076,18 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, charset, containers - , directory, doctest, filepath, parsec, QuickCheck - , quickcheck-instances, scientific, text, transformers + ({ mkDerivation, attoparsec, base, base-orphans, bytestring + , charset, containers, directory, doctest, filepath, parsec + , QuickCheck, quickcheck-instances, scientific, text, transformers , unordered-containers }: mkDerivation { pname = "parsers"; - version = "0.12.2.1"; - sha256 = "c7cae580925dded426c4a434a4f9a4a4db07f5fcc2395b401dec798144c73f73"; + version = "0.12.3"; + sha256 = "c29058e385d6235d3222aa1fde08399ed7ef24a8b8eb0691c2c4dfe1d1ad9fa3"; libraryHaskellDepends = [ - attoparsec base charset containers parsec scientific text - transformers unordered-containers + attoparsec base base-orphans charset containers parsec scientific + text transformers unordered-containers ]; testHaskellDepends = [ attoparsec base bytestring containers directory doctest filepath @@ -103503,6 +104342,7 @@ self: { testHaskellDepends = [ base hspec HUnit QuickCheck text ]; description = "Components of paths"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "pathfinding" = callPackage @@ -103634,6 +104474,7 @@ self: { homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "paypal-api" = callPackage @@ -103802,15 +104643,16 @@ self: { }) {}; "pcre-heavy" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, pcre-light - , stringable, template-haskell + ({ mkDerivation, base, base-compat, bytestring, doctest, Glob + , pcre-light, semigroups, string-conversions, template-haskell }: mkDerivation { pname = "pcre-heavy"; - version = "0.2.5"; - sha256 = "01b599e8a3629795b4afb2bbb9e65bb114ddbccd867ca8806d75aa56e3bacde7"; + version = "1.0.0.1"; + sha256 = "a83e86a72c2bd8073dc71fc115c3b432c00c6294918250bed87f34a8c31ab0ec"; libraryHaskellDepends = [ - base bytestring pcre-light stringable template-haskell + base base-compat bytestring pcre-light semigroups + string-conversions template-haskell ]; testHaskellDepends = [ base doctest Glob ]; homepage = "https://github.com/myfreeweb/pcre-heavy"; @@ -103886,7 +104728,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-core" = callPackage @@ -103904,7 +104745,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-document" = callPackage @@ -103924,7 +104764,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf-toolbox-viewer" = callPackage @@ -103946,7 +104785,6 @@ self: { homepage = "https://github.com/Yuras/pdf-toolbox"; description = "Simple pdf viewer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdf2line" = callPackage @@ -104309,6 +105147,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "period" = callPackage + ({ mkDerivation, base, hspec, HUnit, optparse-applicative, parsec + , text, text-show, time + }: + mkDerivation { + pname = "period"; + version = "0.1.0.1"; + sha256 = "b83dfef9a9de6746e0bc852f816cb00cfd564e2cc5af1bcd5c4f2c82b12b308e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base parsec text text-show time ]; + executableHaskellDepends = [ base optparse-applicative text ]; + testHaskellDepends = [ base hspec HUnit text time ]; + homepage = "https://github.com/w3rs/period"; + description = "Parse and format date periods, collapse and expand their text representations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "perm" = callPackage ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework , test-framework-hunit, transformers @@ -104414,6 +105270,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-cereal" = callPackage @@ -104505,6 +105362,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-mysql" = callPackage @@ -104514,8 +105372,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.2"; - sha256 = "e9bb569739cb268b6a6895490ce4235bc789cd1fddc98ac3ac79cac7b7930a26"; + version = "2.3"; + sha256 = "c4d24a212698b78bd25fb9c8024291f0f4914cd76dbbac00c629abc7f64d4342"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -104524,6 +105382,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-odbc" = callPackage @@ -104566,6 +105425,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-protobuf" = callPackage @@ -104623,6 +105483,7 @@ self: { jailbreak = true; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-refs" = callPackage @@ -104661,6 +105522,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-template" = callPackage @@ -104684,6 +105546,7 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persistent-vector" = callPackage @@ -104731,6 +105594,7 @@ self: { jailbreak = true; description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "persona" = callPackage @@ -104791,18 +105655,18 @@ self: { ({ mkDerivation, asn1-encoding, asn1-types, base, bytable , bytestring, cipher-aes, crypto-numbers, crypto-pubkey , crypto-pubkey-types, crypto-random, cryptohash, handle-like - , monad-control, monads-tf, network, pem, random, stm - , transformers-base, word24, x509, x509-store, x509-validation + , monad-control, monads-tf, network, pem, peyotls-codec, random + , stm, transformers-base, x509, x509-store, x509-validation }: mkDerivation { pname = "peyotls"; - version = "0.1.6.5"; - sha256 = "2e4d2c301578fb7b5e26bc244a6597aa50c8575df538aa73b0cc1cfe6320c637"; + version = "0.1.6.7"; + sha256 = "866e5491c288f2dfe8e9fd8ee1c86c2e6984b2b252f32403d464bf9ef0a3194a"; libraryHaskellDepends = [ asn1-encoding asn1-types base bytable bytestring cipher-aes crypto-numbers crypto-pubkey crypto-pubkey-types crypto-random - cryptohash handle-like monad-control monads-tf pem stm - transformers-base word24 x509 x509-store x509-validation + cryptohash handle-like monad-control monads-tf pem peyotls-codec + stm transformers-base x509 x509-store x509-validation ]; testHaskellDepends = [ base bytestring crypto-random handle-like network random stm x509 @@ -104815,6 +105679,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "peyotls-codec" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytable + , bytestring, crypto-pubkey, crypto-pubkey-types, word24, x509 + , x509-store + }: + mkDerivation { + pname = "peyotls-codec"; + version = "0.1.0.0"; + sha256 = "dfc9ff08fa1369186ce770475026863886acc50fde177a8feb41a4e9fd6aed42"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytable bytestring crypto-pubkey + crypto-pubkey-types word24 x509 x509-store + ]; + jailbreak = true; + homepage = "https://github.com/YoshikuniJujo/peyotls/wiki"; + description = "Codec parts of Pretty Easy YOshikuni-made TLS library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pez" = callPackage ({ mkDerivation, base, failure, fclabels, QuickCheck , test-framework, test-framework-quickcheck2, thrist @@ -104906,7 +105790,6 @@ self: { ]; description = "simply download a video (or a file) from a webpage and xdg-open it"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -105309,22 +106192,23 @@ self: { "pinboard" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either - , haskell-src-exts, HsOpenSSL, http-streams, http-types, io-streams - , mtl, network, old-locale, random, text, time, transformers + , http-client, http-client-tls, http-types, mtl, network + , old-locale, random, text, time, transformers , unordered-containers, vector }: mkDerivation { pname = "pinboard"; - version = "0.6.5"; - sha256 = "481ded4b043cf38df4a1da8de0ddbd52c4693f316fc52fd1f9c0ba28b26ddd76"; + version = "0.8.8"; + sha256 = "1cc3ece4a1267c5445e67e54b6479579666f4ac5b7e035aa318b2600922d88ae"; libraryHaskellDepends = [ - aeson base bytestring containers either haskell-src-exts HsOpenSSL - http-streams http-types io-streams mtl network old-locale random - text time transformers unordered-containers vector + aeson base bytestring containers either http-client http-client-tls + http-types mtl network old-locale random text time transformers + unordered-containers vector ]; homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipe-enumerator" = callPackage @@ -105635,6 +106519,7 @@ self: { homepage = "http://github.com/kvanberendonck/pipes-courier"; description = "Pipes utilities for interfacing with the courier message-passing framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-csv" = callPackage @@ -105656,7 +106541,7 @@ self: { ]; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; "pipes-errors" = callPackage @@ -105701,8 +106586,8 @@ self: { }: mkDerivation { pname = "pipes-extras"; - version = "1.0.0"; - sha256 = "b323bc73aaf3b37ac958f4ef062843393bc868861bd0149d6bf9c667ebda98b7"; + version = "1.0.1"; + sha256 = "b5b5780713a9b92e4168e66f2e37a82c1f159f13be4c3d8c1c8326de4c8c28dc"; libraryHaskellDepends = [ base foldl pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers @@ -105752,6 +106637,7 @@ self: { homepage = "https://github.com/jwiegley/pipes-files"; description = "Fast traversal of directory trees using pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "pipes-group" = callPackage @@ -105824,6 +106710,7 @@ self: { homepage = "http://github.com/jb55/pipes-mongodb"; description = "Stream results from MongoDB"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; "pipes-network" = callPackage @@ -106309,6 +107196,7 @@ self: { homepage = "http://github.com/amcphail/plot"; description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-gtk" = callPackage @@ -106321,6 +107209,7 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-gtk-ui" = callPackage @@ -106338,6 +107227,7 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-gtk3" = callPackage @@ -106352,6 +107242,7 @@ self: { homepage = "http://code.haskell.org/plot"; description = "GTK3 plots and interaction with GHCi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plot-lab" = callPackage @@ -106369,6 +107260,7 @@ self: { homepage = "https://github.com/sumitsahrawat/plot-lab"; description = "A plotting tool with Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "plotserver-api" = callPackage @@ -106609,6 +107501,7 @@ self: { array base containers haskell-src-exts HUnit QuickCheck transformers ]; + jailbreak = true; description = "Tool for refactoring expressions into pointfree form"; license = "unknown"; }) {}; @@ -106735,6 +107628,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polar-shader" = callPackage + ({ mkDerivation, base, containers, hspec, lens, mtl }: + mkDerivation { + pname = "polar-shader"; + version = "0.1.0.1"; + sha256 = "829390e1e8ed5dcfb49ed52f96866f95483e7b404c65f11b6fe3745860460cc7"; + libraryHaskellDepends = [ base containers lens mtl ]; + testHaskellDepends = [ base containers hspec ]; + description = "High-level shader compiler for Polar Game Engine"; + license = stdenv.lib.licenses.asl20; + }) {}; + "polh-lexicon" = callPackage ({ mkDerivation, base, binary, containers, dawg, directory , filepath, mtl, polysoup, text, text-binary, transformers @@ -106957,8 +107862,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.4.2.2"; - sha256 = "9bfdb948d425f7628c67ca3a5c57c23e971852e92904a509377aa8df36c82bcf"; + version = "0.4.3"; + sha256 = "b8f6dd052e2b494f01cafa2613510ef8a62b8fad6a445fe0fd60723fbca388db"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -107148,6 +108053,7 @@ self: { homepage = "http://code.haskell.org/portaudio"; description = "Haskell bindings for the PortAudio library"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) portaudio;}; "porte" = callPackage @@ -107308,6 +108214,7 @@ self: { homepage = "https://github.com/mvv/posix-timer"; description = "Bindings to POSIX clock and timer functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "posix-waitpid" = callPackage @@ -107496,10 +108403,8 @@ self: { }: mkDerivation { pname = "postgresql-schema"; - version = "0.1.3"; - sha256 = "a08c0cc84ec664cb35acb399c7e57c390db658a8e7a672479dc7b143d5ed249e"; - revision = "1"; - editedCabalFile = "48c36bad1c6796bd2c7211e0002d2aafc5bb0c8dedde4ec9f8ece597335096ce"; + version = "0.1.4"; + sha256 = "274dac6dcd5d263b4e2023d35901f9b02914b804aa71cd39f10ee813e2cd4ffd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107508,7 +108413,6 @@ self: { executableHaskellDepends = [ base base-prelude old-locale optparse-applicative shelly text time ]; - jailbreak = true; homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; @@ -107642,15 +108546,14 @@ self: { , hspec-wai, hspec-wai-json, HTTP, http-media, http-types, jwt , MissingH, mtl, network, network-uri, optparse-applicative , packdeps, process, QuickCheck, Ranged-sets, regex-base - , regex-tdfa, regex-tdfa-text, resource-pool, scientific, split - , string-conversions, stringsearch, text, time, transformers - , unordered-containers, vector, wai, wai-cors, wai-extra - , wai-middleware-static, warp + , regex-tdfa, resource-pool, scientific, split, string-conversions + , stringsearch, text, time, transformers, unordered-containers + , vector, wai, wai-cors, wai-extra, wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.2.10.0"; - sha256 = "fe2e67f849ac37427f1ef4a9d98c44ce4b77078232a655a959987ad96eab3668"; + version = "0.2.11.1"; + sha256 = "5cc8f06c2db31640709245a7eceb0894e5c66fd65a6a03228f8ab263c355792b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107658,18 +108561,18 @@ self: { case-insensitive cassava containers convertible hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa - regex-tdfa-text resource-pool scientific split string-conversions - stringsearch text time transformers unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + resource-pool scientific split string-conversions stringsearch text + time transformers unordered-containers vector wai wai-cors + wai-extra wai-middleware-static warp ]; executableHaskellDepends = [ aeson base base64-string bcrypt blaze-builder bytestring case-insensitive cassava containers convertible hasql hasql-backend hasql-postgres HTTP http-types jwt MissingH mtl network network-uri optparse-applicative Ranged-sets regex-base regex-tdfa - regex-tdfa-text resource-pool scientific split string-conversions - stringsearch text time transformers unordered-containers vector wai - wai-cors wai-extra wai-middleware-static warp + resource-pool scientific split string-conversions stringsearch text + time transformers unordered-containers vector wai wai-cors + wai-extra wai-middleware-static warp ]; testHaskellDepends = [ aeson base base64-string bcrypt blaze-builder bytestring @@ -107677,8 +108580,8 @@ self: { hasql-postgres heredoc hlint hspec hspec-wai hspec-wai-json HTTP http-media http-types jwt MissingH mtl network network-uri optparse-applicative packdeps process QuickCheck Ranged-sets - regex-base regex-tdfa regex-tdfa-text resource-pool scientific - split string-conversions stringsearch text time transformers + regex-base regex-tdfa resource-pool scientific split + string-conversions stringsearch text time transformers unordered-containers vector wai wai-cors wai-extra wai-middleware-static warp ]; @@ -107794,6 +108697,7 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Potrace bindings for the diagrams library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "powermate" = callPackage @@ -108062,11 +108966,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "prelude-extras"; - version = "0.4"; - sha256 = "56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57"; + version = "0.4.0.1"; + sha256 = "440ec309825161d1eb594e54a8c32f443f9ac64fa075ca9e39d13ac148c682e2"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/ekmett/prelude-extras"; - description = "Haskell 98 - higher order versions of Prelude classes"; + description = "Higher order versions of Prelude classes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -108238,6 +109142,7 @@ self: { homepage = "http://github.com/haskell/pretty"; description = "Pretty-printing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-class" = callPackage @@ -108263,6 +109168,20 @@ self: { license = "GPL"; }) {}; + "pretty-error" = callPackage + ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }: + mkDerivation { + pname = "pretty-error"; + version = "0.1.0.0"; + sha256 = "ada53c7d0e9ab16b24bc70a0b64a9f95d707d4aa267c3c659dab0fd31c680e36"; + libraryHaskellDepends = [ + base basic-prelude bytestring pretty-show + ]; + homepage = "https://github.com/jml/pretty-error"; + description = "Pretty error messages for runtime invariants"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pretty-hex" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -108388,6 +109307,7 @@ self: { homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "primitive" = callPackage @@ -108475,6 +109395,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/printxosd"; description = "Simple tool to display some text on an on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "priority-queue" = callPackage @@ -108542,12 +109463,11 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.4.1"; - sha256 = "6c4bcb7343d1fda94fb1799e3e1d8dc45c5a018ac40b38d4f8d19e36001d075a"; + version = "0.2.5"; + sha256 = "1dccf0a260f37f0725f02d2f1d4f1cd61da67477dacc77caf5007584ec53a9c0"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; @@ -108567,6 +109487,7 @@ self: { homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "proc" = callPackage @@ -108596,6 +109517,7 @@ self: { testHaskellDepends = [ base ]; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-conduit" = callPackage @@ -109210,8 +110132,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.7.2"; - sha256 = "9c1cc565bfdea30d58c5306ef2dda9d4e86984f9f9004c0fe43011b481ce4db8"; + version = "2.7.3"; + sha256 = "0309899702da827d8fa3184c08e2de664cb0ba8df007b66caedd66894e85d151"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -109316,6 +110238,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "A wrapper for the proteaaudio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "protobuf" = callPackage @@ -109372,8 +110295,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.1.5"; - sha256 = "1028200fcef97d76f28e9ff22100066ad6b797c56fbf0222735b1ed4ece060dd"; + version = "2.1.6"; + sha256 = "81f732202f7bf3e2fc697e5c5be13c46e5ef3af1d3b82d7b4394cf6fea942ebe"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -109387,8 +110310,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.1.5"; - sha256 = "cd653ce9ad16eadb080d6e19647da5fe5ccde7e3e2fb85464cbc460d44ca44f0"; + version = "2.1.6"; + sha256 = "7558c7193cb74e90f1f02956d4ecddd5405fc956d64b422e7f105aa512e4332f"; libraryHaskellDepends = [ base bytestring containers protocol-buffers ]; @@ -109556,6 +110479,7 @@ self: { array base deepseq ghc-prim hashable HUnit QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -109737,6 +110661,7 @@ self: { homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "pugs-DrIFT" = callPackage @@ -109760,7 +110685,6 @@ self: { homepage = "http://pugscode.org/"; description = "DrIFT with pugs-specific rules"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-HsSyck" = callPackage @@ -109792,7 +110716,6 @@ self: { ]; description = "Portable Haskell/POSIX layer for Pugs"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pugs-hsregex" = callPackage @@ -109818,6 +110741,7 @@ self: { librarySystemDepends = [ libpulseaudio ]; description = "binding to Simple API of pulseaudio"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libpulseaudio;}; "punkt" = callPackage @@ -109995,8 +110919,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.7.3.0"; - sha256 = "27d9e4bd3061a2b64e10d4d7c140b2debd786772309aa36e0b7fdaa49b42b5c0"; + version = "0.7.4.1"; + sha256 = "82d41cbde580e86620d18d03f38508b2d5f0c1ce4719ac62f3ea2bbe35ee4b9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110019,7 +110943,6 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bundle-fast" = callPackage @@ -110124,6 +111047,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pusher-http-haskell" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , containers, cryptohash, hashable, hspec, http-client, http-types + , mtl, QuickCheck, snap-core, snap-server, text, time, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "0.2.0.0"; + sha256 = "439fbfb5244ef1ccd2f7ed0854ec199c70912ecaf76465871b741dcc86ed8129"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash hashable + http-client http-types mtl QuickCheck text time transformers + unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring containers mtl snap-core snap-server text + transformers unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types mtl QuickCheck + text transformers unordered-containers + ]; + jailbreak = true; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pushme" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hslogger, io-storage, lens, old-locale, optparse-applicative @@ -110486,6 +111440,7 @@ self: { homepage = "https://github.com/boundedvariation/quantfin"; description = "Quant finance library in pure Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "quantities" = callPackage @@ -110809,6 +111764,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-text" = callPackage + ({ mkDerivation, base, binary, bytestring, QuickCheck, text }: + mkDerivation { + pname = "quickcheck-text"; + version = "0.1.0.1"; + sha256 = "bf33117023b1b2980e516ec74e15b214bc14211fa3ef4daa5a7c7d9a651b553c"; + libraryHaskellDepends = [ base binary bytestring QuickCheck text ]; + testHaskellDepends = [ base bytestring QuickCheck text ]; + homepage = "https://github.com/olorin/quickcheck-text"; + description = "Alternative arbitrary instance for Text"; + license = stdenv.lib.licenses.mit; + }) {}; + "quickcheck-unicode" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -110918,13 +111886,20 @@ self: { }) {}; "quickwebapp" = callPackage - ({ mkDerivation, base, bytestring, http-types, scotty, text }: + ({ mkDerivation, aeson, base, bytestring, containers, either, lucid + , servant, servant-lucid, servant-server, text, warp + }: mkDerivation { pname = "quickwebapp"; - version = "2.1.0.0"; - sha256 = "3252164d5016faaf251de0794be012d314eaf3b74044313d42a505653977987f"; - libraryHaskellDepends = [ base bytestring http-types scotty text ]; - jailbreak = true; + version = "3.0.0.2"; + sha256 = "1b84a728f36fe68c92b269174e9c3655112408f78c2990d0c6568f9fb80f282d"; + revision = "1"; + editedCabalFile = "9d34bc5555232a31a1c17ced7fbbae606278fdc19e54d6a058f331c2cabace65"; + libraryHaskellDepends = [ + aeson base bytestring containers either lucid servant servant-lucid + servant-server text warp + ]; + homepage = "https://github.com/jtanguy/quickwebapp"; description = "A quick webapp generator for any file processing tool"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -110933,8 +111908,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "quiver"; - version = "0.0.0.11"; - sha256 = "ca895a811d854e1e1e164a4f3988f3515deb2dc2220c0af6ee153b826aebb6df"; + version = "0.0.0.12"; + sha256 = "3ae4d76c2b4f4805b43ac6136c865142d3e847affb86e1e3dba6f9bb35e7bf04"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zadarnowski/quiver"; description = "Quiver finite stream processing library"; @@ -110957,8 +111932,8 @@ self: { ({ mkDerivation, base, data-cell, quiver }: mkDerivation { pname = "quiver-cell"; - version = "0.0.0.2"; - sha256 = "4e95b819c71225ac76342ace1472c93ecadbc549aa2b6d08fffa5c5e250de182"; + version = "1.0.0"; + sha256 = "e806d29ffb46b80ddd21cca89de3c9d4606dbc30aad523fa9691ca05e12e0c51"; libraryHaskellDepends = [ base data-cell quiver ]; homepage = "https://github.com/zadarnowski/quiver-cell"; description = "Quiver combinators for cellular data processing"; @@ -111001,6 +111976,8 @@ self: { pname = "quiver-http"; version = "0.0.0.2"; sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0"; + revision = "1"; + editedCabalFile = "ca7fe920bd4fd519db582ca6fcfdc82f5e62563df3e29827f523acf423f43380"; libraryHaskellDepends = [ base bytestring http-client http-client-tls quiver ]; @@ -111035,6 +112012,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "qux" = callPackage + ({ mkDerivation, base, language-qux, mtl, optparse-applicative }: + mkDerivation { + pname = "qux"; + version = "0.1.0.0"; + sha256 = "fb2de869de3645b69c0f4bada356e3d1fd2902cf7d09315f7797eee93dd6f1da"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base language-qux mtl optparse-applicative + ]; + homepage = "https://github.com/qux-lang/qux"; + description = "Command line binary for working with the Qux language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rabocsv2qif" = callPackage ({ mkDerivation, base, old-locale, split, time }: mkDerivation { @@ -111409,6 +112403,7 @@ self: { homepage = "http://github.com/aristidb/random-extras"; description = "Additional functions for random values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "random-fu" = callPackage @@ -111427,6 +112422,7 @@ self: { homepage = "https://github.com/mokus0/random-fu"; description = "Random number generation"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "random-hypergeometric" = callPackage @@ -111550,6 +112546,7 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/range"; description = "This has a bunch of code for specifying and managing ranges in your code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "range-set-list" = callPackage @@ -111573,8 +112570,8 @@ self: { }: mkDerivation { pname = "range-space"; - version = "0.1.1.2"; - sha256 = "2465f41de6245ccb481ac6734ff7dc22521bc4ed98aa874e668c06eadf2c9419"; + version = "0.1.2.0"; + sha256 = "388d6cea0511019d7e0b43989722e94202d505772271a5f84ec66d99856b38c3"; libraryHaskellDepends = [ base semigroups vector-space vector-space-points ]; @@ -111582,11 +112579,9 @@ self: { base QuickCheck semigroups test-framework test-framework-quickcheck2 time vector-space vector-space-points ]; - jailbreak = true; homepage = "https://github.com/JohnLato/range-space"; description = "A Range type with vector-space instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rangemin" = callPackage @@ -111624,6 +112619,7 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://haskell-distributed.github.com"; description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types"; license = stdenv.lib.licenses.bsd3; @@ -111818,6 +112814,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rcu" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, hlint + , parallel, stm, transformers + }: + mkDerivation { + pname = "rcu"; + version = "0"; + sha256 = "be314c597e8b47af60195a906a210f2cfc01d1d5c3b453ece0135e0869a7648f"; + libraryHaskellDepends = [ base stm transformers ]; + testHaskellDepends = [ + base directory doctest filepath hlint parallel + ]; + homepage = "http://github.com/ekmett/rcu/"; + description = "STM-based Read-Copy-Update"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rdf4h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , directory, fgl, hashable, HTTP, HUnit, hxt, knob, network @@ -111910,14 +112924,15 @@ self: { homepage = "https://john-millikin.com/software/haskell-re2/"; description = "Bindings to the re2 regular expression library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "react-flux" = callPackage ({ mkDerivation, aeson, base, deepseq, mtl, text }: mkDerivation { pname = "react-flux"; - version = "0.9.1"; - sha256 = "704b253c655442c03eb90e1c4b36660dc6416745c041c590362c3f6762cc9615"; + version = "0.9.4"; + sha256 = "3e030f6439f25fda59de81d487b289b76106e8d08985dba4e444892deb62e4b6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base deepseq mtl text ]; @@ -112016,20 +113031,20 @@ self: { }) {}; "reactive-banana" = callPackage - ({ mkDerivation, base, containers, hashable, HUnit, psqueues - , test-framework, test-framework-hunit, transformers + ({ mkDerivation, base, containers, hashable, HUnit, pqueue + , psqueues, test-framework, test-framework-hunit, transformers , unordered-containers, vault }: mkDerivation { pname = "reactive-banana"; - version = "0.8.1.2"; - sha256 = "ead933b650793b078a9c8c9daf86c4f1cd45007a4a1a4c96bfa5257f328863aa"; + version = "0.9.0.0"; + sha256 = "255930fdf0dcf40fe126ae2f4f274267cfd1e5f49b548618c3c84e3a8ad79683"; libraryHaskellDepends = [ - base containers hashable psqueues transformers unordered-containers + base containers hashable pqueue transformers unordered-containers vault ]; testHaskellDepends = [ - base containers hashable HUnit psqueues test-framework + base containers hashable HUnit pqueue psqueues test-framework test-framework-hunit transformers unordered-containers vault ]; homepage = "http://wiki.haskell.org/Reactive-banana"; @@ -112049,6 +113064,7 @@ self: { base data-lens data-lens-template reactive-banana SDL SDL-image SDL-ttf ]; + jailbreak = true; homepage = "https://github.com/JPMoresmau/reactive-banana-sdl"; description = "Reactive Banana bindings for SDL"; license = stdenv.lib.licenses.gpl3; @@ -112075,17 +113091,18 @@ self: { ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }: mkDerivation { pname = "reactive-banana-wx"; - version = "0.8.0.4"; - sha256 = "8fe99c2d49ae2b579716447caf9b75b31d951e57b796073bd6c1cdad530600e4"; + version = "0.9.0.2"; + sha256 = "ebb1b7e3eb6f973bd9922d27af64c94c28fc392655d2271c10b29a6c89ad3c5d"; configureFlags = [ "-f-buildexamples" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cabal-macosx reactive-banana wx wxcore ]; - homepage = "http://haskell.org/haskellwiki/Reactive-banana"; + homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "reactive-fieldtrip" = callPackage @@ -112499,6 +113516,7 @@ self: { aeson api-builder base bytestring Cabal hspec http-client http-client-tls text time transformers ]; + jailbreak = true; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; license = stdenv.lib.licenses.bsd2; @@ -112876,6 +113894,8 @@ self: { pname = "reflex-dom"; version = "0.2"; sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd"; + revision = "1"; + editedCabalFile = "772321874e1c03eb514ba47c9866f0a856da71b708bffc27701f0a051bca1b24"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -113229,10 +114249,8 @@ self: { }: mkDerivation { pname = "regex-tdfa"; - version = "1.2.0"; - sha256 = "fc82ac14aae378c543a55cdac3f944aae5bff9918c4a342e1da87d38ba4ef401"; - revision = "1"; - editedCabalFile = "5489b69b9f0e8e181ee5134fd500bb0e2b4f914234c5223c59186035fb50478e"; + version = "1.2.1"; + sha256 = "a38d305eeb78be2e34542b423e6a4763fbb8ad1df757aed01993785858c871a7"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -113697,6 +114715,7 @@ self: { homepage = "https://github.com/nh2/reinterpret-cast"; description = "Memory reinterpretation casts for Float/Double and Word32/Word64"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "relacion" = callPackage @@ -113915,7 +114934,6 @@ self: { homepage = "https://github.com/octomarat/HaskellDebugger"; description = "Interface to ghci debugger"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "remotion" = callPackage @@ -113953,6 +114971,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "renderable" = callPackage + ({ mkDerivation, base, containers, hashable }: + mkDerivation { + pname = "renderable"; + version = "0.0.0.1"; + sha256 = "468bc3379eda6e6782fceb8555b4adb26a391e6ac81f3cb9a5bd24e4f646cc25"; + libraryHaskellDepends = [ base containers hashable ]; + homepage = "http://zyghost.com"; + description = "Provides a nice API for rendering data types that change over time"; + license = stdenv.lib.licenses.mit; + }) {}; + "reord" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114169,6 +115199,7 @@ self: { homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; description = "HMatrix operations for Repa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "repa-plugin" = callPackage @@ -114238,6 +115269,7 @@ self: { ]; description = "Reading and writing sound files with repa arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "repa-stream" = callPackage @@ -114511,21 +115543,22 @@ self: { homepage = "http://hub.darcs.net/thielema/resistor-cube"; description = "Compute total resistance of a cube of resistors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "resolve-trivial-conflicts" = callPackage - ({ mkDerivation, ansi-terminal, base, Diff, directory, filepath - , mtl, process, unix + ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory + , filepath, mtl, process, unix }: mkDerivation { pname = "resolve-trivial-conflicts"; - version = "0.3.0.2"; - sha256 = "98dd5e44b9ff14b6a3809cc7b127785389cdc97abd080ec4a91f436ec583c4b4"; + version = "0.3.1.1"; + sha256 = "4f50a77d04eb304da3c7f93368c4dc5f9e65e705895fa58c018fa0b8f9d79452"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - ansi-terminal base Diff directory filepath mtl process unix + ansi-terminal base base-compat Diff directory filepath mtl process + unix ]; homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts"; description = "Remove trivial conflict markers in a git repository"; @@ -114702,6 +115735,8 @@ self: { pname = "rest-core"; version = "0.36.0.5"; sha256 = "0e23ee4cb3a01185bc714cc5c56a0f8390dfefb00f8ca1114f63fb39808470f7"; + revision = "1"; + editedCabalFile = "7f11e39a4d8e972fc2e5773f45019351fbe039aa35d6821a673d6de1519576cf"; libraryHaskellDepends = [ aeson aeson-utils base bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random @@ -114755,6 +115790,8 @@ self: { pname = "rest-gen"; version = "0.17.1.2"; sha256 = "4aed5068ebdbac25a7c5a377904f64a6a48a83370985856258ca2c40d57a3516"; + revision = "2"; + editedCabalFile = "2b7d43435169be39d3976983cfc287cd39cc49a2ceefeca19937a21f7481e22c"; libraryHaskellDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -115083,12 +116120,13 @@ self: { }: mkDerivation { pname = "reverse-geocoding"; - version = "0.2.2.1"; - sha256 = "0c63a52ef6bd4f62b9b9fe0c16e279d3cf91326847da0f3c778a8e867c059b7c"; + version = "0.2.2.2"; + sha256 = "3e1b2f6f44272a1173483b8d2aa9c4bfa4eb1bc15e99468e7fa3aae156e75f59"; + revision = "1"; + editedCabalFile = "9d91cf76a4c2958487e3ec7ad6e38963cbae63cf8586ca041c71addb84dd009c"; libraryHaskellDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; - jailbreak = true; homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; @@ -115605,6 +116643,7 @@ self: { homepage = "http://github.com/agrafix/rocksdb-haskell"; description = "Haskell bindings to RocksDB"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-linux" ]; }) {inherit (pkgs) rocksdb;}; "roguestar" = callPackage @@ -116265,6 +117304,7 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage @@ -116321,7 +117361,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -116982,6 +118022,7 @@ self: { homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Binding to the C samtools library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) zlib;}; "samtools-conduit" = callPackage @@ -117004,6 +118045,7 @@ self: { homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Conduit interface to SAM/BAM format files through samtools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "samtools-enumerator" = callPackage @@ -117019,6 +118061,7 @@ self: { ]; description = "Enumerator interface to SamTools library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "samtools-iteratee" = callPackage @@ -117102,6 +118145,7 @@ self: { homepage = "https://github.com/tokiwoousaka/Sarasvati"; description = "audio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sasl" = callPackage @@ -117172,6 +118216,7 @@ self: { homepage = "https://github.com/jwaldmann/satchmo"; description = "SAT encoding monad"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "satchmo-backends" = callPackage @@ -117253,6 +118298,7 @@ self: { homepage = "https://github.com/msakai/satchmo-toysat"; description = "toysat driver as backend for satchmo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sbv" = callPackage @@ -117332,8 +118378,8 @@ self: { }: mkDerivation { pname = "scalpel"; - version = "0.2.1"; - sha256 = "e061abe1b6015818461fbdcacc91509575af8865bea5d024eb4b4f74e23d6a53"; + version = "0.2.1.1"; + sha256 = "fdcad5f9b1b98e0a8720317fe20b8a696efcdda88f7384dc8e579dd026a17ad6"; libraryHaskellDepends = [ base bytestring curl regex-base regex-tdfa tagsoup text ]; @@ -118196,6 +119242,7 @@ self: { homepage = "https://github.com/davnils/sde-solver"; description = "Distributed SDE solver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sdf2p1-parser" = callPackage @@ -118217,15 +119264,21 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, SDL2, transformers }: + ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 + , StateVar, text, transformers, vector + }: mkDerivation { pname = "sdl2"; - version = "1.3.1"; - sha256 = "db5358e2fe0c5bffb362590037703db623c5be50bc94ded7620c8af163b5a39d"; - libraryHaskellDepends = [ base transformers ]; + version = "2.0.0"; + sha256 = "d6acf9bd5ac10a9a47f2823ac8773afb5e82a6b85cc9e83a89de819e51bf8411"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; librarySystemDepends = [ SDL2 ]; libraryPkgconfigDepends = [ SDL2 ]; - description = "Low-level bindings to SDL2"; + description = "Both high- and low-level bindings to the SDL library (version 2.0.3)."; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; @@ -118238,8 +119291,10 @@ self: { libraryHaskellDepends = [ base sdl2 ]; librarySystemDepends = [ SDL2 ]; libraryPkgconfigDepends = [ SDL2 SDL2_image ]; + jailbreak = true; description = "Haskell binding to sdl2-image"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; "sdl2-ttf" = callPackage @@ -118253,6 +119308,7 @@ self: { testHaskellDepends = [ base sdl2 ]; description = "Binding to libSDL2-ttf"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;}; "sdnv" = callPackage @@ -118538,6 +119594,7 @@ self: { homepage = "http://nonempty.org/software/haskell-select"; description = "Wrap the select(2) POSIX function"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "selectors" = callPackage @@ -118916,6 +119973,7 @@ self: { libraryHaskellDepends = [ base bytestring vector ]; description = "Sequence Alignment"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "seqid_0_1_0" = callPackage @@ -118928,6 +119986,7 @@ self: { jailbreak = true; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid" = callPackage @@ -118951,6 +120010,7 @@ self: { jailbreak = true; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seqid-streams" = callPackage @@ -119156,8 +120216,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.4"; - sha256 = "d2b95b9f9b8173fe83d08166707d564b2cb60526493fc7b4099e09f9480a16ec"; + version = "0.4.4.2"; + sha256 = "fc5c80822fef28b63d8a63bd63efd0bdd86c7d13f06d1cc6e9b0768c4efe61aa"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -119198,8 +120258,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4"; - sha256 = "1a94a0c0ffe7cd6ddb9bea99f31ee63a1dac538965fe03b3ecd75c068f7f1a90"; + version = "0.4.4.2"; + sha256 = "da58db6c24bb5360c3ee027061d7e9183667c1bdbde56d70f4f8e8fef982a47b"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -119215,8 +120275,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.4"; - sha256 = "7f1b8835bddbe8b1eafa6dee9dc780561ad851e9b68e8a5c16ea45b32ee2aa54"; + version = "0.4.4.2"; + sha256 = "d5b95b943215aa227f390c284f84043d7c0db2531416ff44511e0d209bc498c3"; libraryHaskellDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -119230,6 +120290,7 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "servant-docs" = callPackage @@ -119239,8 +120300,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.4"; - sha256 = "ccf92b38df3506b25e6fe93d7ded665db8c1cef76a73913afa72aa2e0d19e54e"; + version = "0.4.4.2"; + sha256 = "449ff2c953c4282f768c7d514f0c5a68e7d8541bde973d0ebe50372987355d90"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119293,8 +120354,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4"; - sha256 = "d54bfef47474ef525285074008ec371df437891e7f2fa9473b9c6cc7f1a4f9e3"; + version = "0.4.4.2"; + sha256 = "76edea7d08e6ee4e5c41e2056f34353dd4033ba4a171008b92e1d34f1cbd146c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -119306,6 +120367,7 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "servant-jquery" = callPackage @@ -119315,8 +120377,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.4"; - sha256 = "6d5726b74ee4b83d84ab62d8f3af1afc0743715d9624056d97148a9ebb654212"; + version = "0.4.4.2"; + sha256 = "c807d103b47b4f7c31708deb92786171a9b7fce2314232400caf2be74b7225ad"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; @@ -119335,14 +120397,36 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4"; - sha256 = "19ae35c4e46b409388d58a9f8e926ea18c4bbe1a4819cebe3d7d4f195adbc9ef"; + version = "0.4.4.2"; + sha256 = "073cff7d8e1551d1300d9d5c74159f3a7912951ac1874080359406e6de9fed01"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; license = stdenv.lib.licenses.bsd3; }) {}; + "servant-mock" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-types, QuickCheck + , servant, servant-server, transformers, wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.4.4.2"; + sha256 = "d203424df5f2d0484f874f81ec98623c226ab89f5c232c3a884aa3b91230e7c6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-types QuickCheck servant servant-server + transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + homepage = "http://github.com/haskell-servant/servant"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -119367,7 +120451,10 @@ self: { pname = "servant-pool"; version = "0.1"; sha256 = "c938fcd6d2e6a6d5b45932fd7d01622c2f09b7f947a63f2d25ad5d0756a7c445"; + revision = "1"; + editedCabalFile = "f84940c58e21db3616aa0f6846ae89395aa2589de5ad8cdb91bc7e21acec8c97"; libraryHaskellDepends = [ base resource-pool servant time ]; + jailbreak = true; homepage = "http://github.com/zalora/servant-pool"; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; license = stdenv.lib.licenses.bsd3; @@ -119398,6 +120485,8 @@ self: { pname = "servant-response"; version = "0.1"; sha256 = "1e32b385757555a03c29fa6a8e02d5ae1ce8c436997db8ed923bb851ad89ff6d"; + revision = "1"; + editedCabalFile = "5ee181fcc10725b2f8a2188716dfcc36d134c7aef11458cc4e85902f67611dd2"; libraryHaskellDepends = [ aeson base http-types text ]; homepage = "http://github.com/zalora/servant"; description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; @@ -119412,10 +120501,13 @@ self: { pname = "servant-scotty"; version = "0.1.1"; sha256 = "031d68f2d688e4f97b65366ce5ef5c6fc124998e01498b7ffc315ca1d4617e34"; + revision = "1"; + editedCabalFile = "5355af06c17f104c8276672de58b2cbcb3c0e7e200d0f596622740326c0a32fa"; libraryHaskellDepends = [ aeson base http-types scotty servant servant-response text transformers ]; + jailbreak = true; homepage = "http://github.com/zalora/servant"; description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = stdenv.lib.licenses.bsd3; @@ -119432,8 +120524,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.4.1"; - sha256 = "4889f732694a34232660660332cfd61b1e404f5adedd2b96a21a42dfdb51556a"; + version = "0.4.4.2"; + sha256 = "9c937f01f0ce3ae354097406e8617ee10bbcbd86513c5808b3c430ecba4f7fff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -119482,8 +120574,8 @@ self: { }: mkDerivation { pname = "serversession-backend-acid-state"; - version = "1.0.1"; - sha256 = "470d11dc0d4a445babe240698ef4b6abc3fd48ab832ff52907ad5f81fcdd85c1"; + version = "1.0.2"; + sha256 = "3495c43b0ba669ee623a8b5365d7df1388f4f0326bb0999c5aff4310bcbcf026"; libraryHaskellDepends = [ acid-state base containers mtl safecopy serversession unordered-containers @@ -119492,10 +120584,10 @@ self: { acid-state base containers hspec mtl safecopy serversession unordered-containers ]; - jailbreak = true; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using acid-state"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-backend-persistent" = callPackage @@ -119789,23 +120881,26 @@ self: { }) {}; "sets" = callPackage - ({ mkDerivation, base, commutative, containers, contravariant - , discrimination, hashable, invariant, QuickCheck - , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, commutative, composition, containers + , contravariant, hashable, invariant, keys, mtl, QuickCheck + , quickcheck-instances, semigroupoids, semigroups, tasty + , tasty-hunit, tasty-quickcheck, transformers, transformers-base , unordered-containers, witherable }: mkDerivation { pname = "sets"; - version = "0.0.4.1"; - sha256 = "322fbed083aa5e4618808627acdae25432691a98cb7ef84e3491affc46335978"; + version = "0.0.5"; + sha256 = "78772618d3a85cbf91a20f0289eb833c4304d6a93c78bb266c38b60e85d2717b"; libraryHaskellDepends = [ - base commutative containers contravariant discrimination hashable - invariant unordered-containers witherable + base commutative composition containers contravariant hashable + invariant keys mtl QuickCheck semigroupoids semigroups transformers + transformers-base unordered-containers witherable ]; testHaskellDepends = [ - base commutative containers contravariant discrimination hashable - invariant QuickCheck quickcheck-instances tasty tasty-hunit - tasty-quickcheck unordered-containers witherable + base commutative composition containers contravariant hashable + invariant keys mtl QuickCheck quickcheck-instances semigroupoids + semigroups tasty tasty-hunit tasty-quickcheck transformers + transformers-base unordered-containers witherable ]; description = "Various set implementations in Haskell"; license = stdenv.lib.licenses.mit; @@ -119906,6 +121001,7 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -120146,8 +121242,8 @@ self: { }: mkDerivation { pname = "shake-language-c"; - version = "0.8.0"; - sha256 = "65d408c47b622ef0cce3f1c17faa0ab67457a1268941db0ce83ebe7c5988feac"; + version = "0.8.1"; + sha256 = "707631799b102d375610a4b5bff567c8ad5b62e36616d162bac1ca8617915073"; libraryHaskellDepends = [ base data-default-class fclabels process shake split unordered-containers @@ -120239,6 +121335,7 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; "shakespeare-css" = callPackage @@ -120383,6 +121480,7 @@ self: { homepage = "https://github.com/nh2/shared-memory"; description = "POSIX shared memory"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sharedio" = callPackage @@ -120525,6 +121623,7 @@ self: { pretty-show process regex-tdfa safe test-framework test-framework-hunit utf8-string ]; + jailbreak = true; homepage = "http://joyful.com/shelltestrunner"; description = "A tool for testing command-line programs"; license = "GPL"; @@ -120583,8 +121682,8 @@ self: { }: mkDerivation { pname = "shivers-cfg"; - version = "0.1"; - sha256 = "8a8306f11c80acbb31c0e1cbcd3ca8095e60e2b2e20dff4b81b8325a044d2ecb"; + version = "0.1.1"; + sha256 = "ecf4dfb70e6a98f9a5304329d8f4893f88e7c51904f6a599961b9f4b9f7664c1"; libraryHaskellDepends = [ base containers directory HPDF language-dot mtl pretty process ]; @@ -120656,6 +121755,7 @@ self: { homepage = "http://github.com/CRogers/should-not-typecheck"; description = "A HUnit/hspec assertion library to verify that an expression does not typecheck"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "show" = callPackage @@ -120837,6 +121937,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "signal" = callPackage + ({ mkDerivation, base, unix }: + mkDerivation { + pname = "signal"; + version = "0.1.0.2"; + sha256 = "80643e609ce60d9be49c13cf2a11b6ed948248de413434a162f3253c66f901fe"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base unix ]; + executableHaskellDepends = [ base ]; + jailbreak = true; + homepage = "http://github.com/pmlodawski/signal"; + description = "Multiplatform signal support for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "signals" = callPackage ({ mkDerivation, array, base, constraints, containers, data-reify , exception-mtl, exception-transformers, language-c-quote @@ -121439,6 +122555,7 @@ self: { testHaskellDepends = [ base HUnit mtl parsec pretty test-framework test-framework-hunit ]; + jailbreak = true; homepage = "http://jakewheat.github.io/simple-sql-parser/"; description = "A parser for SQL queries"; license = stdenv.lib.licenses.bsd3; @@ -122121,8 +123238,8 @@ self: { }: mkDerivation { pname = "sloane"; - version = "4.0.1"; - sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9"; + version = "4.1.0"; + sha256 = "3640b64b30dbc01fc1c1dddad0334a1930c6a708b80c8d91f03adee0bf60b17a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -122184,8 +123301,8 @@ self: { }: mkDerivation { pname = "smallcaps"; - version = "0.6.0.0"; - sha256 = "d169ea6a68e87f64c8661debe9ec21c4b0b00d9c421f488527f6a3c8b6de5fee"; + version = "0.6.0.1"; + sha256 = "b20b7527ee8b9957504e3126161c205fde04a82d460812a60aea1ee3c3549e38"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122196,7 +123313,6 @@ self: { testHaskellDepends = [ attoparsec base containers data-default parsec text ]; - jailbreak = true; description = "Flatten camel case text in LaTeX files"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122214,20 +123330,14 @@ self: { }) {}; "smallcheck-laws" = callPackage - ({ mkDerivation, base, smallcheck, smallcheck-series, tasty - , tasty-smallcheck - }: + ({ mkDerivation, base, smallcheck, smallcheck-series }: mkDerivation { pname = "smallcheck-laws"; - version = "0.1"; - sha256 = "007671d00bdc79201fda20e0ca276a69547ae51e47ab646d3cff703d57756185"; - revision = "1"; - editedCabalFile = "ff6bf8f4f1f7b95550c9adc53125bfb25dc665260f5121eaf811ca3a08e386a1"; - libraryHaskellDepends = [ - base smallcheck smallcheck-series tasty tasty-smallcheck - ]; - testHaskellDepends = [ base smallcheck tasty ]; - description = "SmallCheck properties for standard type classes"; + version = "0.3"; + sha256 = "87d8ee55131915b5549a0053b605729222e3d6c79be94f8bb35aa263f50ad6cb"; + libraryHaskellDepends = [ base smallcheck smallcheck-series ]; + homepage = "http://github.com/jdnavarro/smallcheck-laws"; + description = "SmallCheck properties for common laws"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -122257,8 +123367,8 @@ self: { }: mkDerivation { pname = "smallcheck-series"; - version = "0.4"; - sha256 = "c054bfafa736d2f0f99c0aad8f26bb775d0588e9d076be9e60d8d5842dee3116"; + version = "0.5.1"; + sha256 = "8bee99c89c9437bbaf7f5c203957ed73b0d2e419956f7e509ed5bc8a19728cdd"; libraryHaskellDepends = [ base bytestring containers logict smallcheck text transformers ]; @@ -122337,8 +123447,8 @@ self: { }: mkDerivation { pname = "smartcheck"; - version = "0.2.1"; - sha256 = "398104789966eb2cb4e2fa764405d47214923f2a33ee46b0cbc9b618a1237ce6"; + version = "0.2.2"; + sha256 = "3a0aacd5fa0ae6a1748fc3ca19e53a675d46b14b4ddc482c572b63934f1185f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122420,6 +123530,7 @@ self: { homepage = "https://github.com/GetShopTV/smsaero"; description = "SMSAero API and HTTP client based on servant library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "smt-lib" = callPackage @@ -122442,6 +123553,8 @@ self: { pname = "smtLib"; version = "1.0.7"; sha256 = "6e660125d16c7ad42120df7fb0bd53d1d0614532ed3956aa34f6bcd3413ac2ca"; + revision = "1"; + editedCabalFile = "7a1d7c3e0e90bddb41538fa724f410e2a6915793ab14df4dfc4074c9d09d448e"; libraryHaskellDepends = [ base pretty ]; description = "A library for working with the SMTLIB format"; license = stdenv.lib.licenses.bsd3; @@ -122522,20 +123635,18 @@ self: { "smtps-gmail" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , conduit, conduit-extra, cprng-aes, data-default, filepath - , mime-mail, network, resourcet, stringsearch, text, tls - , transformers + , conduit, conduit-extra, data-default, filepath, mime-mail + , network, resourcet, stringsearch, text, tls, transformers }: mkDerivation { pname = "smtps-gmail"; - version = "1.3.0"; - sha256 = "69ef59a99a7552cc4b37826e1e58f6fc1ec8fbdc6f43f67887ed019e719f7e6d"; + version = "1.3.1"; + sha256 = "d70bbd06bd3dec44a96dbaff9a8ddb1af6e67703775df7c297e771e4cdadd39b"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring conduit conduit-extra - cprng-aes data-default filepath mime-mail network resourcet - stringsearch text tls transformers + data-default filepath mime-mail network resourcet stringsearch text + tls transformers ]; - jailbreak = true; homepage = "https://github.com/enzoh/smtps-gmail"; description = "Gmail SMTP Client"; license = stdenv.lib.licenses.bsd3; @@ -123339,20 +124450,19 @@ self: { "snaplet-postgresql-simple" = callPackage ({ mkDerivation, base, bytestring, clientsession, configurator - , errors, lens, MonadCatchIO-transformers, mtl, postgresql-simple + , lens, MonadCatchIO-transformers, mtl, postgresql-simple , resource-pool-catchio, snap, text, transformers , unordered-containers }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "0.6.0.3"; - sha256 = "0f4c86c9d94560a1e12af151a7ab9bb7e21f10c70ddb5403ae8503dd1a0cf866"; + version = "0.6.0.4"; + sha256 = "44cca67347a81257533edc9570bf9303081a11d40e8000390a75f3f48e071687"; libraryHaskellDepends = [ - base bytestring clientsession configurator errors lens + base bytestring clientsession configurator lens MonadCatchIO-transformers mtl postgresql-simple resource-pool-catchio snap text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -123669,6 +124779,7 @@ self: { homepage = "http://github.com/bos/snappy"; description = "Bindings to the Google Snappy library for fast compression/decompression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) snappy;}; "snappy-conduit" = callPackage @@ -123682,6 +124793,7 @@ self: { homepage = "http://github.com/tatac1/snappy-conduit/"; description = "Conduit bindings for Snappy (see snappy package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "snappy-framing" = callPackage @@ -123694,6 +124806,7 @@ self: { homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "snappy-iteratee" = callPackage @@ -123746,6 +124859,7 @@ self: { homepage = "https://github.com/pmiddend/sneakyterm"; description = "Tiny, declarative wrapper around ncurses"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "sneathlane-haste" = callPackage @@ -123877,6 +124991,7 @@ self: { homepage = "http://code.mathr.co.uk/snowglobe"; description = "randomized fractal snowflakes demo"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "soap" = callPackage @@ -124874,6 +125989,7 @@ self: { homepage = "http://michael.orlitzky.com/code/spline3.php"; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "splines" = callPackage @@ -124907,6 +126023,7 @@ self: { homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "split" = callPackage @@ -124980,6 +126097,7 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/splitter"; description = "Use numerical ranges to split out certain lines from a file"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splot" = callPackage @@ -125111,6 +126229,7 @@ self: { homepage = "https://github.com/yanatan16/haskell-spsa"; description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "spy" = callPackage @@ -125310,17 +126429,17 @@ self: { "squeeze" = callPackage ({ mkDerivation, base, Cabal, directory, factory, filepath, mtl - , QuickCheck, random, toolshed, unix + , QuickCheck, random, toolshed }: mkDerivation { pname = "squeeze"; - version = "1.0.4.5"; - sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231"; + version = "1.0.4.7"; + sha256 = "f1961d7922ca1fb8839cc3d5c536d3b4c7e8aa81ddbb187655581e8e97bdb31a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory factory filepath mtl QuickCheck random - toolshed unix + toolshed ]; homepage = "http://functionalley.eu"; description = "A file-packing application"; @@ -125614,20 +126733,21 @@ self: { , containers, cryptohash, cryptohash-conduit, deepseq , deepseq-generics, directory, either, enclosed-exceptions , exceptions, extra, fast-logger, file-embed, filelock, filepath - , fsnotify, hashable, hastache, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-base, monad-control - , monad-logger, monad-loops, mtl, old-locale, optparse-applicative - , optparse-simple, path, persistent, persistent-sqlite - , persistent-template, pretty, process, project-template - , QuickCheck, resourcet, retry, safe, split, stm, streaming-commons - , tar, template-haskell, temporary, text, time, transformers - , transformers-base, unix, unix-compat, unordered-containers - , vector, vector-binary-instances, void, word8, yaml, zlib + , fsnotify, gitrev, hashable, hastache, hspec, http-client + , http-client-tls, http-conduit, http-types, ignore, lifted-base + , monad-control, monad-logger, monad-loops, mtl, old-locale + , optparse-applicative, optparse-simple, path, persistent + , persistent-sqlite, persistent-template, pretty, process + , project-template, QuickCheck, resourcet, retry, safe, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unix-compat + , unordered-containers, vector, vector-binary-instances, void + , word8, yaml, zlib }: mkDerivation { pname = "stack"; - version = "0.1.3.1"; - sha256 = "af5542c838fa33bd633cad5b9cbd411748a259a06bd0b437094c9d79b0e01e6a"; + version = "0.1.4.1"; + sha256 = "09a076537d546b005788326fb734b47a203ae9507303a9ce554566179dfdfd24"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125637,21 +126757,21 @@ self: { cryptohash-conduit deepseq deepseq-generics directory enclosed-exceptions exceptions extra fast-logger file-embed filelock filepath fsnotify hashable hastache http-client - http-client-tls http-conduit http-types lifted-base monad-control - monad-logger monad-loops mtl old-locale optparse-applicative - optparse-simple path persistent persistent-sqlite - persistent-template pretty process project-template resourcet retry - safe split stm streaming-commons tar template-haskell temporary - text time transformers transformers-base unix unix-compat - unordered-containers vector vector-binary-instances void word8 yaml - zlib + http-client-tls http-conduit http-types ignore lifted-base + monad-control monad-logger monad-loops mtl old-locale + optparse-applicative optparse-simple path persistent + persistent-sqlite persistent-template pretty process + project-template resourcet retry safe split stm streaming-commons + tar template-haskell temporary text time transformers + transformers-base unix unix-compat unordered-containers vector + vector-binary-instances void word8 yaml zlib ]; executableHaskellDepends = [ - base bytestring conduit containers directory either exceptions - filelock filepath hashable http-client http-conduit lifted-base - monad-control monad-logger mtl old-locale optparse-applicative - optparse-simple path process resourcet split text transformers - unordered-containers + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers ]; testHaskellDepends = [ async base bytestring Cabal conduit conduit-extra containers @@ -125659,9 +126779,15 @@ self: { monad-logger optparse-applicative path process QuickCheck resourcet retry temporary text transformers unix-compat ]; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "stack-prism" = callPackage @@ -125775,8 +126901,8 @@ self: { , classy-prelude-conduit, conduit, conduit-extra, containers , cryptohash, cryptohash-conduit, data-default-class, directory , filepath, hspec, html-conduit, http-client, http-client-tls - , http-conduit, mime-types, monad-unlift, mono-traversable, mtl - , old-locale, optparse-applicative, optparse-simple, process + , http-conduit, lucid, mime-types, monad-unlift, mono-traversable + , mtl, old-locale, optparse-applicative, optparse-simple, process , QuickCheck, resourcet, semigroups, stackage-cli, stackage-install , stackage-metadata, stackage-types, stackage-update, stm , streaming-commons, system-fileio, system-filepath, tar, temporary @@ -125785,8 +126911,8 @@ self: { }: mkDerivation { pname = "stackage-curator"; - version = "0.10.0"; - sha256 = "36610b312932a3c348dba4f2b93fb0242312d54e729e1a522964c5b5527d9a36"; + version = "0.11.0"; + sha256 = "4e6946926728bbc91d9897e81f43c4dc5f9efa886bba51068014a78576bf754d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125794,12 +126920,12 @@ self: { base16-bytestring blaze-html byteable bytestring Cabal classy-prelude-conduit conduit conduit-extra containers cryptohash cryptohash-conduit data-default-class directory filepath - html-conduit http-client http-client-tls http-conduit mime-types - monad-unlift mono-traversable mtl old-locale process resourcet - semigroups stackage-install stackage-metadata stackage-types stm - streaming-commons system-fileio system-filepath tar temporary text - time transformers unix-compat utf8-string xml-conduit xml-types - yaml zlib + html-conduit http-client http-client-tls http-conduit lucid + mime-types monad-unlift mono-traversable mtl old-locale process + resourcet semigroups stackage-install stackage-metadata + stackage-types stm streaming-commons system-fileio system-filepath + tar temporary text time transformers unix-compat utf8-string + xml-conduit xml-types yaml zlib ]; executableHaskellDepends = [ base http-client http-client-tls optparse-applicative @@ -125809,7 +126935,6 @@ self: { base Cabal classy-prelude-conduit containers hspec http-client http-client-tls QuickCheck text yaml ]; - jailbreak = true; homepage = "https://github.com/fpco/stackage"; description = "Tools for curating Stackage bundles"; license = stdenv.lib.licenses.mit; @@ -125871,8 +126996,8 @@ self: { }: mkDerivation { pname = "stackage-sandbox"; - version = "0.1.5"; - sha256 = "daaeafd7c23148eec97dc23e1a94fa76d4b6972268b7ff4e3a5b13fb3517b134"; + version = "0.1.6"; + sha256 = "ade45f67b92175869594e64e68f3076feba3b50e863b8b588cff69310def1bdb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -126264,6 +127389,7 @@ self: { homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "statistics-dirichlet" = callPackage @@ -126310,6 +127436,7 @@ self: { homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "statistics-linreg" = callPackage @@ -126326,6 +127453,7 @@ self: { homepage = "http://github.com/alpmestan/statistics-linreg"; description = "Linear regression between two samples, based on the 'statistics' package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "stats" = callPackage @@ -126341,6 +127469,7 @@ self: { homepage = "http://github.com/cheecheeo/stats/"; description = "command line statistics"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "statsd" = callPackage @@ -126478,7 +127607,7 @@ self: { homepage = "https://github.com/schell/steeloverseer"; description = "A file watcher"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "stemmer" = callPackage @@ -127097,28 +128226,26 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.9"; - sha256 = "322fc0911ebb1643d4081fc8b34cf8252def719b5b749017fd8476e2eb16c467"; + version = "0.1.0.15"; + sha256 = "8c9ade2b4353a397b77818223e367af22ec77f1ca137229f8009c947757b832f"; libraryHaskellDepends = [ base mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; - description = "A free monad transformer optimized for streaming applications"; + description = "a free monad transformer optimized for streaming applications"; license = stdenv.lib.licenses.bsd3; }) {}; "streaming-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, deepseq, foldl - , http-client, http-client-tls, mmorph, mtl, streaming, syb + ({ mkDerivation, base, bytestring, deepseq, mmorph, mtl, streaming , transformers }: mkDerivation { pname = "streaming-bytestring"; - version = "0.1.0.1"; - sha256 = "06f0ec85133e273853c3a967f3f806336bb2ad84da24b610a53bb3c76d5a9e20"; + version = "0.1.0.4"; + sha256 = "6b1feca189bac886ca543c00e6952452a6a5033cc33d9ca13be52195dc9d9a42"; libraryHaskellDepends = [ - attoparsec base bytestring deepseq foldl http-client - http-client-tls mmorph mtl streaming syb transformers + base bytestring deepseq mmorph mtl streaming transformers ]; - description = "Lazy bytestring done right"; + description = "effectful byte steams, or: lazy bytestring done right"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127157,6 +128284,7 @@ self: { base containers tasty tasty-hunit tasty-quickcheck ]; license = stdenv.lib.licenses.asl20; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "streamproc" = callPackage @@ -127169,6 +128297,7 @@ self: { homepage = "http://github.com/peti/streamproc"; description = "Stream Processer Arrow"; license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; "streams" = callPackage @@ -127338,6 +128467,8 @@ self: { pname = "string-conv"; version = "0.1"; sha256 = "861a5402709202a1594f5e2ee2792c1ff31be73255619c967516c756e5a4557e"; + revision = "1"; + editedCabalFile = "e6fd8d1b56031e7c1ea24129ddb8bd2c6ab26a63d24b2e90ca40300f217602a9"; libraryHaskellDepends = [ base bytestring text ]; description = "Standardized conversion between string types"; license = stdenv.lib.licenses.bsd3; @@ -127584,6 +128715,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "structs" = callPackage + ({ mkDerivation, base, deepseq, directory, doctest, filepath + , ghc-prim, hlint, parallel, primitive + }: + mkDerivation { + pname = "structs"; + version = "0"; + sha256 = "4ba635175f9db39b13d7ba7ecb2158c1c4228f33d0831e9dd48e5e247cda3970"; + libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; + testHaskellDepends = [ + base directory doctest filepath hlint parallel + ]; + homepage = "http://github.com/ekmett/structs/"; + description = "Strict GC'd imperative object-oriented programming with cheap pointers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "structural-induction" = callPackage ({ mkDerivation, base, containers, genifunctors, geniplate , language-haskell-extract, mtl, pretty, QuickCheck, safe @@ -127740,6 +128888,7 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; + jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; @@ -127758,22 +128907,40 @@ self: { license = "GPL"; }) {}; + "sub-state" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, quickcheck-instances, sets + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "sub-state"; + version = "0.0.0.1"; + sha256 = "970080595b22141e63563f4718515554bf3a59a0c7cfabe694285597468b6dde"; + libraryHaskellDepends = [ base mtl sets ]; + testHaskellDepends = [ + base QuickCheck quickcheck-instances tasty tasty-hunit + tasty-quickcheck + ]; + description = "Get the total, put a single element"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "subhask" = callPackage - ({ mkDerivation, approximate, base, bloomfilter, bytes, bytestring - , cassava, containers, deepseq, erf, gamma, ghc-prim, hmatrix - , hyperloglog, lens, monad-primitive, MonadRandom, mtl, parallel - , pipes, primitive, QuickCheck, semigroups, template-haskell + ({ mkDerivation, approximate, array, base, bloomfilter, bytes + , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim + , hmatrix, hyperloglog, lens, monad-primitive, MonadRandom, mtl + , parallel, primitive, QuickCheck, semigroups, template-haskell , test-framework, test-framework-quickcheck2, vector }: mkDerivation { pname = "subhask"; - version = "0.1.0.1"; - sha256 = "1559bd6c7322281cb43ce988715e57ec91f4795da3abddf9a92967c55835229f"; + version = "0.1.1.0"; + sha256 = "c3e5a727ed988acb4c2a1083136be2faead19bef252345b12695d5050cddc791"; libraryHaskellDepends = [ - approximate base bloomfilter bytes bytestring cassava containers - deepseq erf gamma ghc-prim hmatrix hyperloglog lens monad-primitive - MonadRandom mtl parallel pipes primitive QuickCheck semigroups - template-haskell vector + approximate array base bloomfilter bytes bytestring cassava + containers deepseq erf gamma ghc-prim hmatrix hyperloglog lens + monad-primitive MonadRandom mtl parallel primitive QuickCheck + semigroups template-haskell vector ]; testHaskellDepends = [ base test-framework test-framework-quickcheck2 @@ -128323,6 +129490,7 @@ self: { base containers hashable HUnit network-uri old-locale semigroups test-framework test-framework-hunit text time ]; + jailbreak = true; homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; description = "A semantic web toolkit"; license = "LGPL"; @@ -128494,8 +129662,8 @@ self: { }: mkDerivation { pname = "sync-mht"; - version = "0.3.6.0"; - sha256 = "a6bd7b06e599844e7e93c5fff857b3b0af4975228f1b75fe25407c051f8ea5b9"; + version = "0.3.7.0"; + sha256 = "ffabd97017d74f64adce7fc4b0ca55e8833ea957327c7eb09ae3daa7a12c3838"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128609,6 +129777,7 @@ self: { homepage = "https://github.com/emilaxelsson/syntactic"; description = "Generic representation and manipulation of abstract syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "syntactical" = callPackage @@ -129794,8 +130963,8 @@ self: { }: mkDerivation { pname = "tamarin-prover"; - version = "0.8.6.1"; - sha256 = "8fd2d1ebeb2086529d4ef36f0638b0e8688949669bb5b6fec9c2eee915e6ef3c"; + version = "0.8.6.3"; + sha256 = "62e4133bee08a3991cfc2aad22b4f55d2a85010c356f0b25904d6bcee91e4df4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -129901,6 +131070,7 @@ self: { ]; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tar" = callPackage @@ -129940,11 +131110,12 @@ self: { , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck , syb, tagged, tasty, tasty-hunit, template-haskell, text , text-format, th-lift, transformers, unordered-containers, vector + , z3 }: mkDerivation { pname = "target"; - version = "0.2.0.0"; - sha256 = "249c5936784131d4a114dbfe920aa5dca38b1116b64138273af31710e68b735b"; + version = "0.2.0.1"; + sha256 = "a6366a2eddf278e368ec6b49c7aa483433fad6d473d5bc1751c0049ccd1a98cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129959,10 +131130,11 @@ self: { liquidhaskell mtl tagged tasty tasty-hunit template-haskell unordered-containers ]; + testSystemDepends = [ z3 ]; description = "Generate test-suites from refinement types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + maintainers = with stdenv.lib.maintainers; [ gridaphobe ]; + }) {inherit (pkgs) z3;}; "task" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers @@ -130001,7 +131173,6 @@ self: { ]; description = "Manage pools of possibly interdependent tasks using STM and async"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty" = callPackage @@ -130168,6 +131339,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-laws" = callPackage + ({ mkDerivation, base, smallcheck, smallcheck-laws + , smallcheck-series, tasty, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-laws"; + version = "0.3.1"; + sha256 = "dfe1308dc6e4a41ede3b56cef504dd0e1d210d2ea7cc3e2d296cf72928823226"; + libraryHaskellDepends = [ + base smallcheck smallcheck-laws smallcheck-series tasty + tasty-smallcheck + ]; + testHaskellDepends = [ base smallcheck smallcheck-laws tasty ]; + homepage = "https://github.com/jdnavarro/tasty-laws"; + description = "Test common laws"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tasty-program" = callPackage ({ mkDerivation, base, deepseq, directory, filepath, process, tasty }: @@ -130257,8 +131446,8 @@ self: { }: mkDerivation { pname = "tasty-tap"; - version = "0.0.1"; - sha256 = "c751cea8c7a33e8ec159a661ced1642aa29c2038d876ad1d95c27121848a00c8"; + version = "0.0.2"; + sha256 = "e4390ec7d63393909aa46da9346dc1abc9a4eafa4b82923b6ba776d0777784b7"; libraryHaskellDepends = [ base containers stm tasty ]; testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit @@ -130492,7 +131681,6 @@ self: { homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template" = callPackage @@ -130529,6 +131717,7 @@ self: { libraryHaskellDepends = [ base pretty ]; description = "Support library for Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-util" = callPackage @@ -130850,6 +132039,7 @@ self: { testHaskellDepends = [ base base-unicode-symbols HUnit test-framework test-framework-hunit ]; + jailbreak = true; homepage = "https://github.com/roelvandijk/terminal-progress-bar"; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; @@ -130890,6 +132080,7 @@ self: { homepage = "https://github.com/judah/terminfo"; description = "Haskell bindings to the terminfo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ncurses;}; "terminfo-hs" = callPackage @@ -130906,7 +132097,6 @@ self: { testHaskellDepends = [ base directory errors filepath QuickCheck ]; description = "A pure-Haskell (no FFI) module for accessing terminfo databases"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "terrahs" = callPackage @@ -131000,10 +132190,8 @@ self: { }: mkDerivation { pname = "test-framework-hunit"; - version = "0.3.0.1"; - sha256 = "d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0"; - revision = "1"; - editedCabalFile = "ef6155a767dc221d6f4dd2740fc79f5f4525b67e4cbb5c0ef3e5503d69594b29"; + version = "0.3.0.2"; + sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8"; libraryHaskellDepends = [ base extensible-exceptions HUnit test-framework ]; @@ -131078,6 +132266,7 @@ self: { homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "test-sandbox support for the test-framework package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework-skip" = callPackage @@ -131247,12 +132436,13 @@ self: { ({ mkDerivation, base, HUnit, lifted-base, test-sandbox }: mkDerivation { pname = "test-sandbox-hunit"; - version = "0.1.1"; - sha256 = "be8dfb430eb9e698fd33790c0359f5e8e375a3bc7b2540824c1a8132f4e2bddd"; + version = "0.1.2"; + sha256 = "f3fea0e68663dab3c65a065990220373ba0688a898eec262f9041b62e573166d"; libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ]; homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "HUnit convenience functions for use with test-sandbox"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-sandbox-quickcheck" = callPackage @@ -132054,6 +133244,7 @@ self: { homepage = "http://github.com/sheyll/tftp"; description = "A library for building tftp servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tga" = callPackage @@ -132433,7 +133624,6 @@ self: { homepage = "http://github.com/bennofs/themplate/"; description = "Project templating tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "theoremquest" = callPackage @@ -132483,7 +133673,6 @@ self: { homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thespian" = callPackage @@ -132613,6 +133802,7 @@ self: { testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit ]; + jailbreak = true; homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; license = stdenv.lib.licenses.bsd3; @@ -132850,7 +134040,7 @@ self: { homepage = "https://github.com/koterpillar/tianbar"; description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tic-tac-toe" = callPackage @@ -132887,6 +134077,7 @@ self: { homepage = "https://github.com/nicta/tickle"; description = "A port of @Data.Binary@"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "tictactoe3d" = callPackage @@ -132936,6 +134127,7 @@ self: { homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tidal-vis" = callPackage @@ -132967,10 +134159,9 @@ self: { ({ mkDerivation, base, deepseq, time }: mkDerivation { pname = "tiempo"; - version = "0.0.1.0"; - sha256 = "19a5844015557eff08088469395fe3593021d2c027c607eb1f7fd8c5788caabe"; + version = "0.0.1.1"; + sha256 = "a8b04eef8e1eca0a496410eb82289345c2060be8726b09f5f4b0242d9ffe4a8e"; libraryHaskellDepends = [ base deepseq time ]; - jailbreak = true; homepage = "http://github.com/HaskVan/tiempo"; description = "Specify time intervals in different units (secs, mins, hours, etc.)"; license = stdenv.lib.licenses.mit; @@ -132994,6 +134185,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tight-apply" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tight-apply"; + version = "0.1.0.0"; + sha256 = "8419d1dcaab2a942603584e04bf36369d4d7e4f6560f53ea7a968942a1e62f19"; + libraryHaskellDepends = [ base ]; + description = "Tightly binding infix function application"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "tightrope" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-types , lens, mtl, text, wai, wai-extra, wreq @@ -133078,6 +134280,7 @@ self: { homepage = "https://github.com/haskell/time"; description = "A time library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-compat" = callPackage @@ -133130,6 +134333,7 @@ self: { homepage = "https://github.com/enzoh/time-exts"; description = "Efficient Timestamps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "time-http" = callPackage @@ -133204,7 +134408,6 @@ self: { homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-qq" = callPackage @@ -133222,6 +134425,7 @@ self: { homepage = "https://github.com/christian-marie/time-qq"; description = "Quasi-quoter for UTCTime times"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "time-recurrence" = callPackage @@ -133239,6 +134443,7 @@ self: { base data-ordlist HUnit mtl old-locale test-framework test-framework-hunit time ]; + jailbreak = true; homepage = "http://github.com/hellertime/time-recurrence"; description = "Generate recurring dates"; license = stdenv.lib.licenses.gpl3; @@ -133351,12 +134556,11 @@ self: { }: mkDerivation { pname = "timeout-control"; - version = "0.1"; - sha256 = "57477679b67deb7845ba0ef78d27096f3b1ee2c2088fc207d95dff944c1a5ef0"; + version = "0.2"; + sha256 = "741854f07709ee30c9e31db04745fefc8a42d00023a494e65d17ae40b41679e6"; libraryHaskellDepends = [ base ghc-prim lifted-base monad-control mtl transformers-base ]; - jailbreak = true; homepage = "http://github.com/alphaHeavy/timeout-control"; description = "Updatable timeouts as a Monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -134024,6 +135228,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -134037,6 +135242,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "toml" = callPackage @@ -134394,6 +135600,7 @@ self: { ]; description = "Generic representation of tree transformations"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "transformers_0_4_3_0" = callPackage @@ -134405,6 +135612,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-abort" = callPackage @@ -134594,6 +135802,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "travis" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit + , transformers + }: + mkDerivation { + pname = "travis"; + version = "0.1.0.1"; + sha256 = "eed3dc277851940c32df93f6d3f1343f7a0f0d35998fdcc73f0ffdc8da5ecdd6"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit transformers + ]; + homepage = "http://github.com/tomtau/travis#readme"; + description = "A simple client implementation using Travis CI API"; + license = stdenv.lib.licenses.mit; + }) {}; + "travis-meta-yaml" = callPackage ({ mkDerivation, aeson, base, bytestring, extra, file-embed, lens , lens-aeson, optparse-applicative, regex-applicative, tasty @@ -134914,6 +136138,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "truthful" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "truthful"; + version = "0.1.0.2"; + sha256 = "e47eee33d83123c7c7d2498befc1911081465143cb25329c3bdd7de38f0d1f5d"; + libraryHaskellDepends = [ base ]; + description = "Typeclass for truthfulness of values"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "tsession" = callPackage ({ mkDerivation, base, containers, mtl, time, transformers }: mkDerivation { @@ -135248,6 +136483,7 @@ self: { executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "turkish-deasciifier" = callPackage @@ -135322,6 +136558,7 @@ self: { libraryHaskellDepends = [ base gloss parsec time ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "twentefp-eventloop-graphics" = callPackage @@ -135690,8 +136927,8 @@ self: { }: mkDerivation { pname = "twitter-feed"; - version = "0.2.0.2"; - sha256 = "d38d683310aff56dcade64e55d5dfaa747007802ecbb0d9987def2bdc0847ca6"; + version = "0.2.0.3"; + sha256 = "d68038b73093485318e4f85fce0fe2fad8be90c52c9d76249b5512a93b077a1d"; libraryHaskellDepends = [ aeson authenticate-oauth base bytestring http-conduit ]; @@ -137174,8 +138411,8 @@ self: { ({ mkDerivation, base, ShowF }: mkDerivation { pname = "uniform-pair"; - version = "0.1.7"; - sha256 = "be32baf4cdc36db451b1ee28502a3a357e840b800118ce9102df37ffcbca98e1"; + version = "0.1.8"; + sha256 = "1668512c64d71f299a4b3f477dbf1b027cf38e65e4892c68cda3ca7f3d98e316"; libraryHaskellDepends = [ base ShowF ]; homepage = "https://github.com/conal/uniform-pair/"; description = "Uniform pairs with class instances"; @@ -137417,8 +138654,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "universe-base"; - version = "1.0"; - sha256 = "8475cc6dcfd785e6e9baef146bba7b5aa372ff55311d75866acb1c0467ac0fae"; + version = "1.0.1"; + sha256 = "6de2abd6951f0ae4ef4704bace4117196a5224b4f59c69706424652ca9e474fa"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/dmwit/universe"; description = "A class for finite and recursively enumerable types and some helper functions for enumerating them"; @@ -137443,12 +138680,11 @@ self: { }: mkDerivation { pname = "universe-instances-extended"; - version = "1.0"; - sha256 = "f1ad69a7cbda23c870ebf501715297d2c30ddf6288e95fe1bd6283168d3d8a32"; + version = "1.0.0.1"; + sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997"; libraryHaskellDepends = [ adjunctions base comonad universe-instances-base void ]; - jailbreak = true; homepage = "https://github.com/dmwit/universe"; description = "Universe instances for types from select extra packages"; license = stdenv.lib.licenses.bsd3; @@ -137518,6 +138754,7 @@ self: { homepage = "https://github.com/haskell/unix"; description = "POSIX functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-bytestring" = callPackage @@ -137992,8 +139229,8 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.6"; - sha256 = "46c6d0d84fcaca2ada708b9e7421fb9529619287696c6b44c755c8dcb32ce473"; + version = "0.1.8"; + sha256 = "d1655ca765206ab3f49a6374fe8bd2c6726990dd10814e4600df74c3d0f15dec"; libraryHaskellDepends = [ attoparsec base blaze-builder bytestring ]; @@ -138734,6 +139971,7 @@ self: { base bytestring HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; homepage = "https://github.com/aslatter/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -138787,6 +140025,7 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; + jailbreak = true; homepage = "https://github.com/aslatter/uuid"; description = "Type definitions for Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -139018,19 +140257,20 @@ self: { "validate-input" = callPackage ({ mkDerivation, base, bytestring, either, hspec, mtl, pcre-heavy - , QuickCheck, stringable, text + , QuickCheck, string-conversions, text }: mkDerivation { pname = "validate-input"; - version = "0.2.0.0"; - sha256 = "9abebe0e9eccfeb35398e8fb0c1a7ee7582f83743f15b8403e5edefea39b5446"; + version = "0.3.0.0"; + sha256 = "ee469618a0a4ec7a154f694512383ae1441dd634dd5079f4612dc12e519a0a16"; libraryHaskellDepends = [ - base bytestring either mtl pcre-heavy stringable text + base bytestring either mtl pcre-heavy string-conversions text ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/agrafix/validate-input"; description = "Input validation combinator library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validation" = callPackage @@ -139145,6 +140385,7 @@ self: { ]; description = "Process mpileup output to identify significant differences"; license = "GPL"; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "variable-precision" = callPackage @@ -139183,8 +140424,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "varying"; - version = "0.1.1.2"; - sha256 = "044d0321b199cadb2b8d28edcadfcab4a48708eb49ad27e1c3baf206eb736041"; + version = "0.1.3.0"; + sha256 = "c07d54d7263df225f76f4e4b3ce19b962edabf1bef6b93ea571fca4a1d004888"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base time ]; @@ -139248,6 +140489,7 @@ self: { homepage = "http://github.com/dmbarbour/haskell-vcache"; description = "semi-transparent persistence for Haskell using LMDB, STM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcache-trie" = callPackage @@ -139256,14 +140498,15 @@ self: { }: mkDerivation { pname = "vcache-trie"; - version = "0.2.0"; - sha256 = "6238b76a198e9608e80569f95e0039e67f57a7af439ec18caf69aa3406a2a634"; + version = "0.2.1"; + sha256 = "bf4572fae3cfb58f859b3b6071b71778ce77750e70ad9c6c37b027f50e8504da"; libraryHaskellDepends = [ array base bytestring bytestring-builder vcache ]; homepage = "http://github.com/dmbarbour/haskell-vcache-trie"; description = "patricia tries modeled above VCache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcard" = callPackage @@ -139335,6 +140578,7 @@ self: { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vcswrapper" = callPackage @@ -139410,6 +140654,7 @@ self: { homepage = "http://code.haskell.org/~bkomuves/"; description = "OpenGL support for the `vect' low-dimensional linear algebra library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "vector_0_10_9_2" = callPackage @@ -139423,6 +140668,7 @@ self: { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector" = callPackage @@ -139573,7 +140819,6 @@ self: { homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -139917,7 +141162,6 @@ self: { homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -139946,6 +141190,7 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-linux" ]; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -140257,6 +141502,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.gnome) vte;}; "vtegtk3" = callPackage @@ -140367,7 +141613,6 @@ self: { homepage = "http://jtdaugherty.github.com/vty-ui/"; description = "An interactive terminal user interface library for Vty"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-ui-extras" = callPackage @@ -140953,6 +142198,7 @@ self: { ]; description = "Middleware and utilities for using Atlassian Crowd authentication"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "wai-middleware-etag" = callPackage @@ -141070,7 +142316,6 @@ self: { homepage = "https://github.com/Helkafen/wai-middleware-metrics"; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-preprocessor" = callPackage @@ -141516,19 +142761,21 @@ self: { "waitra" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-types, regex-applicative, tasty, tasty-hunit - , template-haskell, text, wai, wai-extra + , template-haskell, text, wai, wai-app-static, wai-extra, warp }: mkDerivation { pname = "waitra"; - version = "0.0.3.0"; - sha256 = "7643fda19b754bc79195fefaaf05ec9c3707bc24e4b12514d53a7ffe20ac3a7a"; + version = "0.0.4.0"; + sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson base bytestring directory filepath http-types regex-applicative template-haskell text wai ]; + executableHaskellDepends = [ aeson base wai wai-app-static warp ]; testHaskellDepends = [ - aeson base http-types regex-applicative tasty tasty-hunit wai - wai-extra + aeson base http-types tasty tasty-hunit wai wai-extra ]; homepage = "https://github.com/futurice/waitra"; description = "A very simple Wai router"; @@ -142302,6 +143549,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; "webkit-javascriptcore" = callPackage @@ -142333,6 +143581,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Webkit library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; "webkitgtk3-javascriptcore" = callPackage @@ -142348,6 +143597,7 @@ self: { libraryToolDepends = [ gtk2hs-buildtools ]; description = "JavaScriptCore FFI from webkitgtk"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) webkit;}; "webpage" = callPackage @@ -142367,6 +143617,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "webrtc-vad" = callPackage + ({ mkDerivation, base, primitive, vector }: + mkDerivation { + pname = "webrtc-vad"; + version = "0.1.0.2"; + sha256 = "d3ad3ba58ca2389102be09bda8bca69a525c766ada824898cf833d1993368293"; + libraryHaskellDepends = [ base primitive vector ]; + description = "Easy voice activity detection"; + license = stdenv.lib.licenses.mit; + }) {}; + "webserver" = callPackage ({ mkDerivation, base, bytestring, c10k, containers, directory , filepath, network, old-locale, parsec, process, stm, time, unix @@ -142420,6 +143681,7 @@ self: { random SHA test-framework test-framework-hunit test-framework-quickcheck2 text ]; + jailbreak = true; homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -142663,6 +143925,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "why3" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, monadLib, pretty, pretty-show + , profunctors, text + }: + mkDerivation { + pname = "why3"; + version = "0.8"; + sha256 = "8e2d6d29c6fd6f0ecd72a28c3075843533db6a086c67a2a9a520f0dcc916fbf5"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath + monadLib pretty pretty-show profunctors text + ]; + libraryToolDepends = [ alex happy ]; + description = "Haskell support for the Why3 input format"; + license = stdenv.lib.licenses.mit; + }) {}; + "wikipedia4epub" = callPackage ({ mkDerivation, base, bytestring, directory, epub, filepath , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url @@ -143034,6 +144314,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "woot" = callPackage + ({ mkDerivation, base, hspec, vector }: + mkDerivation { + pname = "woot"; + version = "0.0.0.3"; + sha256 = "929d716863bc3194ec4ce10e9b40242ac0bf2c987102aa0a4a0e01ce128cf3de"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec ]; + jailbreak = true; + homepage = "https://github.com/TGOlson/woot-haskell"; + description = "Real time group editor without operational transform"; + license = stdenv.lib.licenses.mit; + }) {}; + "word-trie" = callPackage ({ mkDerivation, base, binary, containers, hspec, QuickCheck }: mkDerivation { @@ -143100,6 +144394,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "wordexp(3) wrappers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wordpass" = callPackage @@ -143123,6 +144418,7 @@ self: { homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "words" = callPackage @@ -143472,15 +144768,16 @@ self: { }) {}; "wx" = callPackage - ({ mkDerivation, base, stm, wxcore }: + ({ mkDerivation, base, stm, time, wxcore }: mkDerivation { pname = "wx"; - version = "0.91.0.0"; - sha256 = "5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c"; - libraryHaskellDepends = [ base stm wxcore ]; + version = "0.92.0.0"; + sha256 = "7a649a4445aaf4681e1c2c9e0b664bce656cc4700a527af8596920019d3295e4"; + libraryHaskellDepends = [ base stm time wxcore ]; homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "wxAsteroids" = callPackage @@ -143519,17 +144816,18 @@ self: { ({ mkDerivation, base, libX11, mesa, wxdirect, wxGTK }: mkDerivation { pname = "wxc"; - version = "0.91.0.0"; - sha256 = "4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a"; + version = "0.92.0.0"; + sha256 = "ed5872f17e05055abaf4427f45f32d817b0f9be0352432fc3ffd08b65305a8dc"; libraryHaskellDepends = [ base wxdirect ]; librarySystemDepends = [ libX11 mesa ]; libraryPkgconfigDepends = [ wxGTK ]; doHaddock = false; - postInstall = "cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so"; + postInstall = "cp -v dist/build/libwxc.so.0.92.0.0 $out/lib/libwxc.so"; postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs"; homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -143539,8 +144837,8 @@ self: { }: mkDerivation { pname = "wxcore"; - version = "0.91.0.0"; - sha256 = "7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06"; + version = "0.92.0.0"; + sha256 = "332a68b658be7eeca62e9992dd01d26016a3f24e6666e803107291a3c71145b9"; libraryHaskellDepends = [ array base bytestring containers directory filepath parsec stm time wxc wxdirect @@ -143549,6 +144847,7 @@ self: { homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "wxHaskell core"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -143557,14 +144856,13 @@ self: { }: mkDerivation { pname = "wxdirect"; - version = "0.91.0.0"; - sha256 = "475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f"; + version = "0.92.0.0"; + sha256 = "b13687de38402df779780db1bc410f02a6ae6815d3e984b702d2c7c4be799ec8"; isLibrary = true; isExecutable = true; executableHaskellDepends = [ base containers directory filepath parsec process strict time ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/WxHaskell"; description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; @@ -143695,16 +144993,16 @@ self: { "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base - , bytestring, containers, cryptonite, directory, filepath - , hourglass, memory, mtl, pem, process, tasty, tasty-quickcheck + , bytestring, containers, cryptonite, hourglass, memory, mtl, pem + , tasty, tasty-quickcheck }: mkDerivation { pname = "x509"; - version = "1.6.0"; - sha256 = "939eec164a1dd764d610920d8896c7715c86f9b437c2d44b27119b3fb197c23b"; + version = "1.6.1"; + sha256 = "cc95fc10135998a5a4bf59566a4e0c7ed6c40f0ff175dfb3023b8ec941df2450"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers - cryptonite directory filepath hourglass memory mtl pem process + cryptonite hourglass memory mtl pem ]; testHaskellDepends = [ asn1-types base bytestring cryptonite hourglass mtl tasty @@ -143717,16 +145015,15 @@ self: { "x509-store" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, directory, filepath, mtl, pem, process - , x509 + , containers, cryptonite, mtl, pem, x509 }: mkDerivation { pname = "x509-store"; - version = "1.6.0"; - sha256 = "d5b347a80d66b0424b92d5a340108d6c674246ddbdd21c223b586be19f582e22"; + version = "1.6.1"; + sha256 = "83d69d2f5ce39fceaeca8e4dcc6d9ebe8a8e94f55d9c23b06cc7a58844e94b05"; libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite - directory filepath mtl pem process x509 + asn1-encoding asn1-types base bytestring containers cryptonite mtl + pem x509 ]; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 collection accessing and storing methods"; @@ -143739,8 +145036,8 @@ self: { }: mkDerivation { pname = "x509-system"; - version = "1.6.0"; - sha256 = "50f9c24513aba2677d71a1c09cbd4f4d6cb82b5e0bad1ecfdfb407f6f5be1735"; + version = "1.6.1"; + sha256 = "ee19385663611f9378a7cdf666aa31af1b142f6762699897e55826271a300e83"; libraryHaskellDepends = [ base bytestring containers directory filepath mtl pem process x509 x509-store @@ -143774,18 +145071,17 @@ self: { "x509-validation" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, byteable - , bytestring, containers, cryptonite, data-default-class, directory - , filepath, hourglass, memory, mtl, network, pem, process, x509 - , x509-store + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, x509, x509-store }: mkDerivation { pname = "x509-validation"; - version = "1.6.0"; - sha256 = "cc07c92402e685fafc31f1fc9d825d6e2775a7f5a423fb0b9b3453ede8349f1e"; + version = "1.6.2"; + sha256 = "6e0b7637036e8f9607112386c7cd7c88babc8cc3e0ff87217e0956fa8fe1bd48"; libraryHaskellDepends = [ asn1-encoding asn1-types base byteable bytestring containers - cryptonite data-default-class directory filepath hourglass memory - mtl network pem process x509 x509-store + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store ]; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 Certificate and CRL validation"; @@ -143808,6 +145104,7 @@ self: { ]; description = "Haskell extended file attributes interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) attr;}; "xbattbar" = callPackage @@ -143822,6 +145119,7 @@ self: { homepage = "https://github.com/polachok/xbattbar"; description = "Simple battery indicator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xcb-types" = callPackage @@ -143929,8 +145227,8 @@ self: { }: mkDerivation { pname = "xdot"; - version = "0.2.4.7"; - sha256 = "6fec12605e032e4d8bd6d87f928909dbfd35bf282d914a6070e721724442eec7"; + version = "0.2.4.8"; + sha256 = "e9bda0abdde68181fe178c7ba176687f8f6438446ee06bd4099df6ca7c155bb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144067,6 +145365,7 @@ self: { homepage = "https://github.com/haskell/xhtml"; description = "An XHTML combinator library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xhtml-combinators" = callPackage @@ -144174,6 +145473,7 @@ self: { testHaskellDepends = [ base unix ]; description = "Haskell bindings for libxkbcommon"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libxkbcommon;}; "xkcd" = callPackage @@ -144837,6 +146137,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {Xrender = null; inherit (pkgs.xlibs) libXpm; inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;}; @@ -144848,13 +146149,19 @@ self: { pname = "xmonad"; version = "0.11.1"; sha256 = "39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd"; + revision = "1"; + editedCabalFile = "12849de2637cf39a8c0311d81418632e719125f55db2faf931b1905d85d5bf3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers directory extensible-exceptions filepath mtl process unix utf8-string X11 ]; - jailbreak = true; + postInstall = '' + shopt -s globstar + mkdir -p $out/share/man/man1 + mv "$out/"**"/man/"*.1 $out/share/man/man1/ + ''; homepage = "http://xmonad.org"; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -145086,6 +146393,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/xosd"; description = "A binding to the X on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) xosd;}; "xournal-builder" = callPackage @@ -145276,6 +146584,7 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "xtest" = callPackage @@ -145396,7 +146705,6 @@ self: { homepage = "http://github.com/snoyberg/yackage"; description = "Personal Hackage replacement for testing new packages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -145487,13 +146795,14 @@ self: { "yaml" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions - , filepath, hspec, HUnit, mockery, resourcet, scientific, text - , transformers, unordered-containers, vector + , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "yaml"; - version = "0.8.13"; - sha256 = "f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a"; + version = "0.8.15.1"; + sha256 = "1db2b881cce7a22f2179e05cdcb9294aac09e9c9f882b1fa4fa9bedacb20cc6c"; + configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145501,6 +146810,7 @@ self: { enclosed-exceptions filepath resourcet scientific text transformers unordered-containers vector ]; + libraryPkgconfigDepends = [ libyaml ]; executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring conduit hspec HUnit @@ -145509,7 +146819,7 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - }) {}; + }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage ({ mkDerivation, base, deepseq, failure, hashable, QuickCheck @@ -145726,6 +147036,7 @@ self: { homepage = "https://github.com/ksaveljev/yampa-2048"; description = "2048 game clone using Yampa/Gloss"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yaop" = callPackage @@ -145805,6 +147116,7 @@ self: { jailbreak = true; description = "Yet Another Template Engine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yavie" = callPackage @@ -146314,23 +147626,24 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, conduit , conduit-extra, containers, either, email-validate , lens-family-core, lens-family-th, MonadRandom, mtl, persistent - , shakespeare, text, time, transformers, yesod-core, yesod-form - , yesod-markdown + , shakespeare, text, time, transformers, yaml, yesod-core + , yesod-form, yesod-markdown }: mkDerivation { pname = "yesod-bootstrap"; - version = "0.1.0.0"; - sha256 = "eff7662f9cc62d97922f947505b1200ac1909fad7d954c668aba6a0d66601fa6"; + version = "0.2"; + sha256 = "d99b97f9ebef228039b9c48725dbf5e610389d99ce7b3f39673741339927c5bd"; libraryHaskellDepends = [ base blaze-html blaze-markup conduit conduit-extra containers either email-validate lens-family-core lens-family-th MonadRandom - mtl persistent shakespeare text time transformers yesod-core + mtl persistent shakespeare text time transformers yaml yesod-core yesod-form yesod-markdown ]; description = "Bootstrap widgets for yesod"; @@ -146425,13 +147738,12 @@ self: { }: mkDerivation { pname = "yesod-crud"; - version = "0.1.2"; - sha256 = "c1419b05e292044df44c2d31e4dda6150ee077b4ef5166c17dd53f99a786324f"; + version = "0.1.3"; + sha256 = "56b1ed4ad8ac35887e6e327774890a31e662de04afb2b295b88df4a85b89c776"; libraryHaskellDepends = [ base classy-prelude containers MissingH monad-control persistent random safe stm uuid yesod-core yesod-form yesod-persistent ]; - jailbreak = true; homepage = "https://github.com/league/yesod-crud"; description = "Generic administrative CRUD operations as a Yesod subsite"; license = stdenv.lib.licenses.bsd3; @@ -146502,8 +147814,8 @@ self: { }: mkDerivation { pname = "yesod-dsl"; - version = "0.1.1.24"; - sha256 = "a73d0796e4148507937566155287721d83c687114c1dfdfd73441ef1e6f8255f"; + version = "0.2.0"; + sha256 = "934aa5de181619e11c39054e9299271a4f447e753589d1b6eafd757216193c49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146518,7 +147830,6 @@ self: { ]; description = "DSL for generating Yesod subsite to manage an RDBMS;"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-eventsource" = callPackage @@ -146966,12 +148277,11 @@ self: { }: mkDerivation { pname = "yesod-pnotify"; - version = "0.5.0"; - sha256 = "faeaaa6ac42f3eba82438e0fdbf92fb5d50deda20957247139e54af48c252c16"; + version = "0.6.0"; + sha256 = "6acee56362153de8613eade60104606090b779a34823659f48544d28d8f1ae1d"; libraryHaskellDepends = [ base shakespeare text transformers yesod yesod-form ]; - jailbreak = true; homepage = "https://github.com/cutsea110/yesod-pnotify"; description = "Yet another getMessage/setMessage using pnotify jquery plugins"; license = stdenv.lib.licenses.bsd3; @@ -147039,7 +148349,6 @@ self: { ]; description = "RAML style route definitions for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-recaptcha" = callPackage @@ -147099,7 +148408,6 @@ self: { homepage = "https://github.com/frontrowed/yesod-routes-flow"; description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -147221,8 +148529,8 @@ self: { }: mkDerivation { pname = "yesod-static"; - version = "1.5.0.2"; - sha256 = "8aec8fc99df9a9910d7a3f732b669753c01dd3ea4177f9e5a7f8cea936b62ea9"; + version = "1.5.0.3"; + sha256 = "a46f952593fc36323aba1352b4b7a2703bb609ec19b709447268e7be24f8ce74"; libraryHaskellDepends = [ async attoparsec base base64-bytestring blaze-builder byteable bytestring conduit conduit-extra containers cryptohash @@ -147253,8 +148561,8 @@ self: { }: mkDerivation { pname = "yesod-static-angular"; - version = "0.1.6"; - sha256 = "c16af2c227bc51da843e8032218939d804e5d36b7619492c318a9a038099b89d"; + version = "0.1.7"; + sha256 = "73278c6d5a4c5dce23f0c20de08f7f98f3069b4443d16d027f09a0653a203e73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147269,10 +148577,10 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; - jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-table" = callPackage @@ -147391,8 +148699,8 @@ self: { }: mkDerivation { pname = "yesod-transloadit"; - version = "0.4.0.0"; - sha256 = "a50270b5829c45c7b72a82137abf94046343f60532bcab0a8a6ef0fd9974745a"; + version = "0.4.1.0"; + sha256 = "4e0a68a2f1d90bdc4489ac18f05bff3728da89756ebbd54cc1654d6b81114c80"; libraryHaskellDepends = [ aeson base byteable bytestring cryptohash lens lens-aeson old-locale shakespeare text time transformers unordered-containers @@ -147563,6 +148871,7 @@ self: { homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-contrib" = callPackage @@ -147605,8 +148914,8 @@ self: { }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.1.0"; - sha256 = "ec851e33888b6fdf74b1c41e3fa5a796c091c375aa51d2b5026870a4556bc70f"; + version = "0.1.0.1"; + sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a"; libraryHaskellDepends = [ base binary containers data-default directory filepath mtl text transformers-base vector yi yi-language yi-rope @@ -147665,6 +148974,7 @@ self: { homepage = "https://github.com/Fuuzetsu/yi-monokai"; description = "Monokai colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-rope" = callPackage @@ -147685,6 +148995,7 @@ self: { ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-snippet" = callPackage @@ -147697,6 +149008,7 @@ self: { homepage = "https://github.com/yi-editor/yi-snippet"; description = "Snippet support for Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-solarized" = callPackage @@ -147709,6 +149021,7 @@ self: { homepage = "https://github.com/NorfairKing/yi-solarized"; description = "Solarized colour theme for the Yi text editor"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-spolsky" = callPackage @@ -147722,6 +149035,7 @@ self: { homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "yi-vty" = callPackage @@ -148023,6 +149337,7 @@ self: { ]; description = "Utilities for reading and writing Alteryx .yxdb files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "z3" = callPackage @@ -148042,6 +149357,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {gomp = null; inherit (pkgs) z3;}; + "zalgo" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "zalgo"; + version = "0.2.0.0"; + sha256 = "5f63a88038ee13dd594907b3591ea2747a563f2a591294b7285a9db83539bf5b"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/mniip/zalgo"; + description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zampolit" = callPackage ({ mkDerivation, base, cmdargs, containers, directory, filepath , HSH, MissingH, old-locale, parsec, time @@ -148393,6 +149720,7 @@ self: { librarySystemDepends = [ zlib ]; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) zlib;}; "zlib" = callPackage diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index e2f6c289a805..14464ceca80d 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { echo building hoogle database # FIXME: rehoo is marked as depricated on Hackage chmod 644 *.hoo *.txt - rehoo -j4 -c64 . + rehoo -j$NIX_BUILD_CORES -c64 . mv default.hoo .x rm -fr downloads *.dep *.txt *.hoo diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 5b2ba44d86d4..635fc317b284 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -66,7 +66,7 @@ rec { buildPhase = "./Setup sdist"; haddockPhase = ":"; checkPhase = ":"; - installPhase = "install -D dist/${drv.pname}-${drv.version}.tar.gz $out/${drv.pname}-${drv.version}.tar.gz"; + installPhase = "install -D dist/${drv.pname}-*.tar.gz $out/${drv.pname}-${drv.version}.tar.gz"; fixupPhase = ":"; }); @@ -74,7 +74,7 @@ rec { unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in '' echo "Source tarball is at ${src}/${tarname}.tar.gz" tar xf ${src}/${tarname}.tar.gz - cd ${tarname} + cd ${pkg.pname}-* ''; }); diff --git a/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch new file mode 100644 index 000000000000..7b32dcb4ab6f --- /dev/null +++ b/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch @@ -0,0 +1,28 @@ +From 35d972b3dc5056110d55315f2256d9c5046299c7 Mon Sep 17 00:00:00 2001 +From: Peter Simons <simons@cryp.to> +Date: Tue, 1 Sep 2015 17:58:36 +0200 +Subject: [PATCH] Revert "Fix maximum sizing calculation." + +This reverts commit 44b01ba38b4fcdb5a85f44fa2f3af1f29cde8f40. The change breaks +this package on 32 bit platforms. See https://github.com/bos/bloomfilter/issues/7 +for further details. +--- + Data/BloomFilter/Easy.hs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Data/BloomFilter/Easy.hs b/Data/BloomFilter/Easy.hs +index 5143c6e..a349168 100644 +--- a/Data/BloomFilter/Easy.hs ++++ b/Data/BloomFilter/Easy.hs +@@ -72,7 +72,7 @@ safeSuggestSizing capacity errRate + minimum [((-k) * cap / log (1 - (errRate ** (1 / k))), k) + | k <- [1..100]] + roundedBits = nextPowerOfTwo (ceiling bits) +- in if roundedBits <= 0 || roundedBits > 0xffffffff ++ in if roundedBits <= 0 + then Left "capacity too large to represent" + else Right (roundedBits, truncate hashes) + +-- +2.5.1 + diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix new file mode 100644 index 000000000000..4f1623504447 --- /dev/null +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, mlton }: + +stdenv.mkDerivation rec { + name = "ceptre-2015-08-15"; + + src = fetchgit { + url = https://github.com/chrisamaphone/interactive-lp; + rev = "cffca6943b6c9f47d064e26ddad92c2d8eb6f0f9"; + sha256 = "0filimwssb656330d9gc8299l44imc5qyaf967p03ypg5260xq0i"; + }; + + nativeBuildInputs = [ mlton ]; + + installPhase = '' + mkdir -p $out/bin + cp ceptre $out/bin + ''; + + meta = with stdenv.lib; { + description = "A linear logic programming language for modeling generative interactive systems"; + homepage = https://github.com/chrisamaphone/interactive-lp; + maintainers = with maintainers; [ pSub ]; + }; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index c9a837744868..85a389c1cea4 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace "/usr/local" $out - substituteInPlace bin/mix \ - --replace "/usr/bin/env elixir" "$out/bin/elixir" ''; postFixup = '' @@ -35,6 +33,9 @@ stdenv.mkDerivation { --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt done + + substituteInPlace $out/bin/mix \ + --replace "/usr/bin/env elixir" "${coreutils}/bin/env $out/bin/elixir" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2d1fd454c0f2..7da631a3cbda 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -285,18 +285,18 @@ let in { php54 = generic { - version = "5.4.44"; - sha256 = "0vc5lf0yjk1fs7inri76mh0lrcmq32ji4m6yqdmg7314x5f9xmcd"; + version = "5.4.45"; + sha256 = "10k59j7zjx2mrldmgfvjrrcg2cslr2m68azslspcz5acanqjh3af"; }; php55 = generic { - version = "5.5.28"; - sha256 = "1wy2v5rmbiia3v6fc8nwg1y3sdkdmicksxnkadz1f3035rbjqz8r"; + version = "5.5.29"; + sha256 = "0imr8c48ffjhc2zm96ndq92z3736xrm12hd5c1lssz67xiwybkpv"; }; php56 = generic { - version = "5.6.12"; - sha256 = "0fl5r0lzav7icg97p7gkvbxk0xk2mh7i1r45dycjlyxgf91109vg"; + version = "5.6.13"; + sha256 = "14zq40j229salk0wp7inl4jvj3xff03bz7g5xn8ipd5skiy86n33"; }; php70 = lib.lowPrio (generic { diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1affd1fa5827..8aa75829554c 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.2"; + version = "6.2.1"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "05g60fzb9dzf52xj9n7s4prybwbr8dqjq94mbdmw5cxk88vi2c8k"; + sha256 = "0555j63k7fs10iv0icmivlxpzgp6s7gwcbfddmbwxlf2rk80qhq0"; }; FONTCONFIG_FILE = fontsConf; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { cd src/build ''; - configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; + configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" "--disable-docs"]; configureScript = "../configure"; diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix index 68a4386bba51..a8fddad2d881 100644 --- a/pkgs/development/libraries/accelio/default.nix +++ b/pkgs/development/libraries/accelio/default.nix @@ -6,15 +6,17 @@ stdenv.mkDerivation rec { name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}"; - version = "2015-07-28"; + version = "2015-08-30"; src = fetchFromGitHub { owner = "accelio"; repo = "accelio"; - rev = "0c4b6d535831650112ba9409a5c7d6e1bc436d61"; - sha256 = "044m92pnvdl64irvy7bdqr51gz0qr5f14xnsig4gkc3vb0afbb4j"; + rev = "3d1f2b2d311aa70de9856832fd02647266624e82"; + sha256 = "172frqk2n43g0arhazgcwfvj0syf861vdzdpxl7idr142bb0ykf7"; }; + patches = [ ./fix-printfs.patch ]; + postPatch = '' # Don't build broken examples sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\).*\/kernel/d' configure.ac diff --git a/pkgs/development/libraries/accelio/fix-printfs.patch b/pkgs/development/libraries/accelio/fix-printfs.patch new file mode 100644 index 000000000000..23b2f40e42fe --- /dev/null +++ b/pkgs/development/libraries/accelio/fix-printfs.patch @@ -0,0 +1,615 @@ +diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c +--- accelio/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:36:25.610337514 -0400 ++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_client.c 2015-09-03 19:59:13.258697472 -0400 +@@ -246,7 +246,7 @@ static void *worker_thread(void *data) + } else { + vmsg_sglist_set_nents(&msg->out, 0); + } +- msg->user_context = (void *)get_cycles(); ++ msg->user_context = (void *)(intptr_t)get_cycles(); + /* send first message */ + if (xio_send_request(tdata->conn, msg) == -1) { + if (xio_errno() != EAGAIN) +@@ -330,7 +330,7 @@ static int on_response(struct xio_sessio + { + struct thread_data *tdata = (struct thread_data *)cb_user_context; + +- cycles_t rtt = (get_cycles()-(cycles_t)msg->user_context); ++ cycles_t rtt = (get_cycles()-(cycles_t)(intptr_t)msg->user_context); + + if (tdata->do_stat) { + if (rtt > tdata->stat.max_rtt) +@@ -358,7 +358,7 @@ static int on_response(struct xio_sessio + msg->in.header.iov_len = 0; + vmsg_sglist_set_nents(&msg->in, 0); + +- msg->user_context = (void *)get_cycles(); ++ msg->user_context = (void *)(intptr_t)get_cycles(); + if (xio_send_request(tdata->conn, msg) == -1) { + if (xio_errno() != EAGAIN) + printf("**** [%p] Error - xio_send_request " \ +@@ -559,7 +559,7 @@ int run_client_test(struct perf_paramete + sess_data.min_lat_us, + sess_data.max_lat_us); + if (fd) +- fprintf(fd, "%lu, %d, %lu, %.2lf, %.2lf\n", ++ fprintf(fd, "%" PRIu64 ", %d, %" PRIu64 ", %.2lf, %.2lf\n", + data_len, + threads_iter, + sess_data.tps, +diff -rup accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h +--- accelio/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:36:25.610337514 -0400 ++++ accelio.new/benchmarks/usr/xio_perftest/xio_perftest_parameters.h 2015-09-03 19:57:30.856215123 -0400 +@@ -90,7 +90,7 @@ typedef enum { READ, WRITE} Verb; + /* The format of the results */ + #define RESULT_FMT " #bytes #threads #TPS BW average[MBps] Latency average[usecs] Latency low[usecs] Latency peak[usecs]\n" + /* Result print format */ +-#define REPORT_FMT " %-7lu %-2d %-9.2lu %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" ++#define REPORT_FMT " %-7" PRIu64 " %-2d %-9.2" PRIu64 " %-9.2lf %-9.2lf %-9.2lf %-9.2lf\n" + + + struct perf_parameters { +diff -rup accelio/examples/usr/hello_world_iov/xio_client.c accelio.new/examples/usr/hello_world_iov/xio_client.c +--- accelio/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:36:25.611337519 -0400 ++++ accelio.new/examples/usr/hello_world_iov/xio_client.c 2015-09-03 19:42:19.983984370 -0400 +@@ -224,7 +224,7 @@ static void process_response(struct sess + len = 64; + tmp = str[len]; + str[len] = '\0'; +- printf("message header : [%lu] - %s\n", ++ printf("message header : [%" PRIu64 "] - %s\n", + (rsp->request->sn + 1), str); + str[len] = tmp; + } +@@ -236,7 +236,7 @@ static void process_response(struct sess + len = 64; + tmp = str[len]; + str[len] = '\0'; +- printf("message data: [%lu][%d][%zd] - %s\n", ++ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", + (rsp->request->sn + 1), i, sglist[i].iov_len, str); + str[len] = tmp; + } +diff -rup accelio/examples/usr/hello_world_iov/xio_server.c accelio.new/examples/usr/hello_world_iov/xio_server.c +--- accelio/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:36:25.611337519 -0400 ++++ accelio.new/examples/usr/hello_world_iov/xio_server.c 2015-09-03 19:43:07.353204184 -0400 +@@ -203,7 +203,7 @@ static void process_request(struct serve + len = 64; + tmp = str[len]; + str[len] = '\0'; +- printf("message header : [%lu] - %s\n", ++ printf("message header : [%" PRIu64 "] - %s\n", + (req->sn + 1), str); + str[len] = tmp; + } +@@ -215,7 +215,7 @@ static void process_request(struct serve + len = 64; + tmp = str[len]; + str[len] = '\0'; +- printf("message data: [%lu][%d][%zd] - %s\n", ++ printf("message data: [%" PRIu64 "][%d][%zd] - %s\n", + (req->sn + 1), i, sglist[i].iov_len, str); + str[len] = tmp; + } +@@ -360,11 +360,11 @@ static int on_msg_error(struct xio_sessi + struct server_data *sdata = (struct server_data *)cb_user_context; + + if (direction == XIO_MSG_DIRECTION_OUT) { +- printf("**** [%p] message %lu failed. reason: %s\n", ++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + } else { + xio_release_response(msg); +- printf("**** [%p] message %lu failed. reason: %s\n", ++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + } + +diff -rup accelio/examples/usr/hello_world_libevent/xio_client.c accelio.new/examples/usr/hello_world_libevent/xio_client.c +--- accelio/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:36:25.612337524 -0400 ++++ accelio.new/examples/usr/hello_world_libevent/xio_client.c 2015-09-03 19:43:32.748322028 -0400 +@@ -87,7 +87,7 @@ static void process_response(struct sess + { + if (++session_data->cnt == PRINT_COUNTER) { + ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; +- printf("message: [%lu] - %s\n", ++ printf("message: [%" PRIu64 "] - %s\n", + (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); + session_data->cnt = 0; + } +diff -rup accelio/examples/usr/hello_world_libevent/xio_server.c accelio.new/examples/usr/hello_world_libevent/xio_server.c +--- accelio/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:36:25.612337524 -0400 ++++ accelio.new/examples/usr/hello_world_libevent/xio_server.c 2015-09-03 19:43:50.556404665 -0400 +@@ -82,7 +82,7 @@ static void process_request(struct serve + len = 64; + tmp = str[len]; + str[len] = '\0'; +- printf("message header : [%lu] - %s\n", ++ printf("message header : [%" PRIu64 "] - %s\n", + (req->sn + 1), str); + str[len] = tmp; + } +@@ -94,7 +94,7 @@ static void process_request(struct serve + len = 64; + tmp = str[len]; + str[len] = '\0'; +- printf("message data: [%lu][%d][%d] - %s\n", ++ printf("message data: [%" PRIu64 "][%d][%d] - %s\n", + (req->sn + 1), i, len, str); + str[len] = tmp; + } +diff -rup accelio/examples/usr/hello_world_mt/xio_mt_client.c accelio.new/examples/usr/hello_world_mt/xio_mt_client.c +--- accelio/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:36:25.611337519 -0400 ++++ accelio.new/examples/usr/hello_world_mt/xio_mt_client.c 2015-09-03 19:41:13.493675827 -0400 +@@ -40,6 +40,7 @@ + #include <string.h> + #include <inttypes.h> + #include <sched.h> ++#include <inttypes.h> + + #include "libxio.h" + +@@ -133,7 +134,7 @@ static void process_response(struct thre + { + if (++tdata->cnt == PRINT_COUNTER) { + ((char *)(rsp->in.header.iov_base))[rsp->in.header.iov_len] = 0; +- printf("thread [%d] - tid:%p - message: [%lu] - %s\n", ++ printf("thread [%d] - tid:%p - message: [%" PRIu64 "] - %s\n", + tdata->affinity, + (void *)pthread_self(), + (rsp->request->sn + 1), (char *)rsp->in.header.iov_base); +diff -rup accelio/examples/usr/hello_world_mt/xio_mt_server.c accelio.new/examples/usr/hello_world_mt/xio_mt_server.c +--- accelio/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:36:25.611337519 -0400 ++++ accelio.new/examples/usr/hello_world_mt/xio_mt_server.c 2015-09-03 19:41:31.730760455 -0400 +@@ -104,7 +104,7 @@ static void process_request(struct threa + struct xio_msg *req) + { + if (++tdata->cnt == PRINT_COUNTER) { +- printf("thread [%d] tid:%p - message: [%lu] - %s\n", ++ printf("thread [%d] tid:%p - message: [%" PRIu64 "] - %s\n", + tdata->affinity, + (void *)pthread_self(), + (req->sn + 1), (char *)req->in.header.iov_base); +diff -rup accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c +--- accelio/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 19:36:25.603337482 -0400 ++++ accelio.new/regression/usr/reg_basic_mt/reg_basic_mt_client.c 2015-09-03 20:00:15.169989095 -0400 +@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi + struct thread_data *tdata = conn_entry->tdata; + + if (direction == XIO_MSG_DIRECTION_OUT) { +- DEBUG("**** [%p] message %lu failed. reason: %s\n", ++ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, req->sn, xio_strerror(error)); + } else { + xio_release_response(req); +- DEBUG("**** [%p] message %lu failed. reason: %s\n", ++ DEBUG("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, req->request->sn, xio_strerror(error)); + } + obj_pool_put(tdata->req_pool, req); +diff -rup accelio/src/tools/usr/xio_if_numa_cpus.c accelio.new/src/tools/usr/xio_if_numa_cpus.c +--- accelio/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:36:25.603337482 -0400 ++++ accelio.new/src/tools/usr/xio_if_numa_cpus.c 2015-09-03 19:40:06.398364476 -0400 +@@ -43,6 +43,7 @@ + #include <net/if.h> + #include <stdio.h> + #include <numa.h> ++#include <inttypes.h> + + #define cpusmask_test_bit(nr, addr) (*(addr) & (1ULL << (nr))) + #define cpusmask_set_bit(nr, addr) (*(addr) |= (1ULL << (nr))) +@@ -244,7 +245,7 @@ int main(int argc, char *argv[]) + } + intf_cpusmask_str(cpusmask, cpusnum, cpus_str); + +- printf("%-10s %-16s %-30s %-5d 0x%-8lx %-4s[%d] - %s\n", ++ printf("%-10s %-16s %-30s %-5d 0x%-8" PRIx64 " %-4s[%d] - %s\n", + ifa->ifa_name, host, flags, numa_node, cpusmask, + "cpus", cpusnum, cpus_str); + } +diff -rup accelio/src/tools/usr/xio_mem_usage.c accelio.new/src/tools/usr/xio_mem_usage.c +--- accelio/src/tools/usr/xio_mem_usage.c 2015-09-03 19:36:25.603337482 -0400 ++++ accelio.new/src/tools/usr/xio_mem_usage.c 2015-09-03 19:38:57.596044838 -0400 +@@ -73,7 +73,7 @@ + while (i++ < 48) { \ + printf("."); \ + } \ +- printf(" %6lu\n", sizeof(type)); \ ++ printf(" %zu\n", sizeof(type)); \ + } + + int main(int argc, char **argv) +diff -rup accelio/tests/portable/direct_rdma_test/xio_rdma_common.c accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c +--- accelio/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:36:25.610337514 -0400 ++++ accelio.new/tests/portable/direct_rdma_test/xio_rdma_common.c 2015-09-03 19:56:25.521908028 -0400 +@@ -90,7 +90,7 @@ static int publish_our_buffer(struct xio + * this flag must be on */ + rsp->flags = XIO_MSG_FLAG_IMM_SEND_COMP; + +- rdma_test_buf.addr = (uint64_t)rdma_reg_mem.addr; ++ rdma_test_buf.addr = (intptr_t)rdma_reg_mem.addr; + rdma_test_buf.length = rdma_reg_mem.length; + rdma_test_buf.rkey = xio_lookup_rkey_by_response(&rdma_reg_mem, rsp); + +diff -rup accelio/tests/usr/hello_test/xio_client.c accelio.new/tests/usr/hello_test/xio_client.c +--- accelio/tests/usr/hello_test/xio_client.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test/xio_client.c 2015-09-03 19:45:43.055926711 -0400 +@@ -181,13 +181,13 @@ static void process_response(struct test + + double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); + double rxbw = (1.0*pps*test_params->stat.rxlen/ONE_MB); +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", + pps, txbw, rxbw, + test_params->stat.txlen, test_params->stat.rxlen); + get_time(timeb, 40); + +- printf("**** [%s] - message [%zd] %s - %s\n", ++ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", + timeb, (rsp->request->sn + 1), + (char *)rsp->in.header.iov_base, + (char *)(inents > 0 ? isglist[0].iov_base : NULL)); +@@ -212,8 +212,8 @@ static int on_session_event(struct xio_s + + switch (event_data->event) { + case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: +- printf("nsent:%lu, nrecv:%lu, " \ +- "delta:%lu\n", ++ printf("nsent:%" PRIu64 ", nrecv:%" PRIu64 ", " \ ++ "delta:%" PRIu64 "\n", + test_params->nsent, test_params->nrecv, + test_params->nsent-test_params->nrecv); + +@@ -370,11 +370,11 @@ static int on_msg_error(struct xio_sessi + struct test_params *test_params = (struct test_params *)cb_user_context; + + if (direction == XIO_MSG_DIRECTION_OUT) { +- printf("**** [%p] message %lu failed. reason: %s\n", ++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + } else { + xio_release_response(msg); +- printf("**** [%p] message %lu failed. reason: %s\n", ++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + } + +diff -rup accelio/tests/usr/hello_test/xio_server.c accelio.new/tests/usr/hello_test/xio_server.c +--- accelio/tests/usr/hello_test/xio_server.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test/xio_server.c 2015-09-03 19:46:35.777171360 -0400 +@@ -112,7 +112,7 @@ static void process_request(struct xio_m + if (++cnt == PRINT_COUNTER) { + struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); + +- printf("**** message [%lu] %s - %s\n", ++ printf("**** message [%" PRIu64 "] %s - %s\n", + (msg->sn+1), + (char *)msg->in.header.iov_base, + (char *)sglist[0].iov_base); +@@ -146,8 +146,8 @@ static int on_session_event(struct xio_s + break; + case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: + if (event_data->reason != XIO_E_SESSION_REJECTED) { +- printf("last sent:%lu, last comp:%lu, " \ +- "delta:%lu\n", ++ printf("last sent:%" PRIu64 ", last comp:%" PRIu64 ", " \ ++ "delta:%" PRIu64 "\n", + test_params->nsent, test_params->ncomp, + test_params->nsent-test_params->ncomp); + test_params->connection = NULL; +@@ -257,7 +257,7 @@ static int on_msg_error(struct xio_sessi + { + struct test_params *test_params = (struct test_params *)cb_user_context; + +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + + msg_pool_put(test_params->pool, msg); +diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_client.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c +--- accelio/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_client.c 2015-09-03 19:49:10.164887785 -0400 +@@ -114,7 +114,7 @@ static void process_request(struct xio_m + if (++cnt == print_counter) { + struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); + +- printf("**** request [%lu] %s - %s\n", ++ printf("**** request [%" PRIu64 "] %s - %s\n", + (req->sn+1), + (char *)req->in.header.iov_base, + (char *)sglist[0].iov_base); +@@ -171,11 +171,11 @@ static void process_response(struct xio_ + double txbw = (1.0*pps*txlen/ONE_MB); + double rxbw = (1.0*pps*rxlen/ONE_MB); + +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", + pps, txbw, rxbw, txlen, rxlen); + get_time(timeb, 40); +- printf("**** [%s] - response [%lu] %s - %s\n", ++ printf("**** [%s] - response [%" PRIu64 "] %s - %s\n", + timeb, (rsp->request->sn + 1), + (char *)rsp->in.header.iov_base, + (char *)(inents > 0 ? isglist[0].iov_base : NULL)); +@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi + { + switch (msg->type) { + case XIO_MSG_TYPE_REQ: +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + msg_pool_put(pool, msg); + switch (error) { +@@ -369,7 +369,7 @@ static int on_msg_error(struct xio_sessi + }; + break; + case XIO_MSG_TYPE_RSP: +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + /* message is no longer needed */ + switch (error) { +diff -rup accelio/tests/usr/hello_test_bidi/xio_bidi_server.c accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c +--- accelio/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test_bidi/xio_bidi_server.c 2015-09-03 19:49:52.860085909 -0400 +@@ -143,11 +143,11 @@ static void process_response(struct xio_ + double txbw = (1.0*pps*txlen/ONE_MB); + double rxbw = (1.0*pps*rxlen/ONE_MB); + +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", + pps, txbw, rxbw, txlen, rxlen); + get_time(timeb, 40); +- printf("**** [%s] - response complete [%lu] %s - %s\n", ++ printf("**** [%s] - response complete [%" PRIu64 "] %s - %s\n", + timeb, (rsp->request->sn + 1), + (char *)rsp->in.header.iov_base, + (char *)(inents > 0 ? isglist[0].iov_base : NULL)); +@@ -171,7 +171,7 @@ static void process_request(struct xio_m + if (++cnt == print_counter) { + struct xio_iovec_ex *sglist = vmsg_sglist(&req->in); + +- printf("**** request complete [%lu] %s - %s [%zd]\n", ++ printf("**** request complete [%" PRIu64 "] %s - %s [%zd]\n", + (req->sn+1), + (char *)req->in.header.iov_base, + (char *)sglist[0].iov_base, +@@ -409,7 +409,7 @@ static int on_msg_error(struct xio_sessi + { + switch (msg->type) { + case XIO_MSG_TYPE_REQ: +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + msg_pool_put(pool, msg); + switch (error) { +@@ -422,7 +422,7 @@ static int on_msg_error(struct xio_sessi + }; + break; + case XIO_MSG_TYPE_RSP: +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + /* message is no longer needed */ + switch (error) { +diff -rup accelio/tests/usr/hello_test_lat/xio_lat_client.c accelio.new/tests/usr/hello_test_lat/xio_lat_client.c +--- accelio/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test_lat/xio_lat_client.c 2015-09-03 19:50:51.111356220 -0400 +@@ -139,7 +139,7 @@ static void process_response(struct xio_ + double rxbw = (1.0*pps*rxlen/ONE_MB); + double lat = (1000000.0/pps); + +- printf("transactions per second: %lu, lat: %.2f us, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", lat: %.2f us, bandwidth: " \ + "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, RX: %zd B\n", + pps, lat, txbw, rxbw, txlen, rxlen); + get_time(timeb, 40); +@@ -312,7 +312,7 @@ static int on_msg_error(struct xio_sessi + struct xio_msg *msg, + void *cb_user_context) + { +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + + msg_pool_put(pool, msg); +diff -rup accelio/tests/usr/hello_test_lat/xio_lat_server.c accelio.new/tests/usr/hello_test_lat/xio_lat_server.c +--- accelio/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test_lat/xio_lat_server.c 2015-09-03 19:51:16.803475442 -0400 +@@ -103,7 +103,7 @@ static void process_request(struct xio_m + if (++cnt == PRINT_COUNTER) { + struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); + +- printf("**** message [%lu] %s - %s\n", ++ printf("**** message [%" PRIu64 "] %s - %s\n", + (msg->sn+1), + (char *)msg->in.header.iov_base, + (char *)sglist[0].iov_base); +@@ -209,7 +209,7 @@ static int on_msg_error(struct xio_sessi + struct xio_msg *msg, + void *cb_user_context) + { +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + + msg_pool_put(pool, msg); +diff -rup accelio/tests/usr/hello_test_mt/xio_mt_client.c accelio.new/tests/usr/hello_test_mt/xio_mt_client.c +--- accelio/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test_mt/xio_mt_client.c 2015-09-03 19:47:39.218465755 -0400 +@@ -179,12 +179,12 @@ static void process_response(struct thre + double txbw = (1.0*pps*tdata->stat.txlen/ONE_MB); + double rxbw = (1.0*pps*tdata->stat.rxlen/ONE_MB); + +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "TX %.2f MB/s, RX: %.2f MB/s, length: TX: %zd B, " \ + "RX: %zd B\n", + pps, txbw, rxbw, tdata->stat.txlen, tdata->stat.rxlen); + get_time(timeb, 40); +- printf("[%s] thread [%d] - tid:%p - message [%lu] " \ ++ printf("[%s] thread [%d] - tid:%p - message [%" PRIu64 "] " \ + "%s - %s\n", + timeb, + tdata->affinity, +@@ -416,11 +416,11 @@ static int on_msg_error(struct xio_sessi + struct thread_data *tdata = (struct thread_data *)cb_user_context; + + if (direction == XIO_MSG_DIRECTION_OUT) { +- printf("**** [%p] message %lu failed. reason: %s\n", ++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + } else { + xio_release_response(msg); +- printf("**** [%p] message %lu failed. reason: %s\n", ++ printf("**** [%p] message %" PRIu64 " failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + } + +diff -rup accelio/tests/usr/hello_test_mt/xio_mt_server.c accelio.new/tests/usr/hello_test_mt/xio_mt_server.c +--- accelio/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:36:25.608337505 -0400 ++++ accelio.new/tests/usr/hello_test_mt/xio_mt_server.c 2015-09-03 19:48:02.876575538 -0400 +@@ -171,7 +171,7 @@ static void process_request(struct threa + if (++tdata->stat.cnt == PRINT_COUNTER) { + struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); + +- printf("thread [%d] - message [%lu] %s - %s\n", ++ printf("thread [%d] - message [%" PRIu64 "] %s - %s\n", + tdata->affinity, + (msg->sn+1), + (char *)msg->in.header.iov_base, +@@ -260,7 +260,7 @@ static int on_msg_error(struct xio_sessi + { + struct thread_data *tdata = (struct thread_data *)cb_user_context; + +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + + msg_pool_put(tdata->pool, msg); +diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_client.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c +--- accelio/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:36:25.609337510 -0400 ++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_client.c 2015-09-03 19:54:18.142316932 -0400 +@@ -150,11 +150,11 @@ static void process_rx_message(struct ow + + double rxbw = (1.0*pps*ow_params->rx_stat.xlen/ONE_MB); + +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "RX: %.2f MB/s, RX: %zd B\n", + pps, rxbw, ow_params->rx_stat.xlen); + get_time(timeb, 40); +- printf("**** [%s] - message [%lu] %s - %s\n", ++ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", + timeb, (msg->sn + 1), + (char *)msg->in.header.iov_base, + (char *)(inents > 0 ? isglist[0].iov_base : NULL)); +@@ -202,11 +202,11 @@ static void process_tx_message(struct ow + + double txbw = (1.0*pps*ow_params->tx_stat.xlen/ONE_MB); + +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "TX %.2f MB/s,length: TX: %zd B\n", + pps, txbw, ow_params->tx_stat.xlen); + get_time(timeb, 40); +- printf("**** [%s] - message [%lu] %s - %s\n", ++ printf("**** [%s] - message [%" PRIu64 "] %s - %s\n", + timeb, (msg->sn + 1), + (char *)msg->out.header.iov_base, + (char *)(onents > 0 ? osglist[0].iov_base : NULL)); +@@ -349,7 +349,7 @@ static int on_msg_error(struct xio_sessi + struct ow_test_params *ow_params = + (struct ow_test_params *)cb_user_context; + +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + + msg_pool_put(ow_params->pool, msg); +diff -rup accelio/tests/usr/hello_test_oneway/xio_oneway_server.c accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c +--- accelio/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:36:25.609337510 -0400 ++++ accelio.new/tests/usr/hello_test_oneway/xio_oneway_server.c 2015-09-03 19:54:32.797384938 -0400 +@@ -112,7 +112,7 @@ static void process_request(struct xio_m + if (++cnt == PRINT_COUNTER) { + struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); + +- printf("**** message [%lu] %s - %s\n", ++ printf("**** message [%" PRIu64 "] %s - %s\n", + (msg->sn+1), + (char *)msg->in.header.iov_base, + (char *)sglist[0].iov_base); +@@ -299,7 +299,7 @@ static int on_msg_error(struct xio_sessi + struct ow_test_params *ow_params = + (struct ow_test_params *)cb_user_context; + +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + + msg_pool_put(ow_params->pool, msg); +diff -rup accelio/tests/usr/hello_test_ow/xio_ow_client.c accelio.new/tests/usr/hello_test_ow/xio_ow_client.c +--- accelio/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:36:25.609337510 -0400 ++++ accelio.new/tests/usr/hello_test_ow/xio_ow_client.c 2015-09-03 19:52:24.905791466 -0400 +@@ -152,7 +152,7 @@ for (i = 0; i < onents; i++) + + double txbw = (1.0*pps*test_params->stat.txlen/ONE_MB); + +- printf("transactions per second: %lu, bandwidth: " \ ++ printf("transactions per second: %" PRIu64 ", bandwidth: " \ + "TX %.2f MB/s, length: TX: %zd B\n", + pps, txbw, + test_params->stat.txlen); +@@ -181,8 +181,8 @@ static int on_session_event(struct xio_s + test_params->closed = 1; + break; + case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: +- printf("nsent:%lu, ncomp:%lu, " \ +- "delta:%lu\n", ++ printf("nsent:%" PRIu64 ", ncomp:%" PRIu64 ", " \ ++ "delta:%" PRIu64 "\n", + test_params->nsent, test_params->ncomp, + test_params->nsent-test_params->ncomp); + +@@ -357,7 +357,7 @@ static int on_msg_error(struct xio_sessi + { + struct test_params *test_params = (struct test_params *)cb_user_context; + +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->sn, xio_strerror(error)); + + msg_pool_put(test_params->pool, msg); +diff -rup accelio/tests/usr/hello_test_ow/xio_ow_server.c accelio.new/tests/usr/hello_test_ow/xio_ow_server.c +--- accelio/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:36:25.609337510 -0400 ++++ accelio.new/tests/usr/hello_test_ow/xio_ow_server.c 2015-09-03 19:52:57.947944796 -0400 +@@ -110,7 +110,7 @@ static void process_request(struct xio_m + if (++cnt == PRINT_COUNTER) { + struct xio_iovec_ex *sglist = vmsg_sglist(&msg->in); + +- printf("**** message [%lu] %s - %s\n", ++ printf("**** message [%" PRIu64 "] %s - %s\n", + (msg->sn+1), + (char *)msg->in.header.iov_base, + (char *)sglist[0].iov_base); +@@ -145,7 +145,7 @@ static int on_session_event(struct xio_s + xio_disconnect(event_data->conn); + break; + case XIO_SESSION_CONNECTION_TEARDOWN_EVENT: +- printf("last recv:%lu\n", ++ printf("last recv:%" PRIu64 "\n", + test_params->nrecv); + + xio_connection_destroy(event_data->conn); +@@ -215,7 +215,7 @@ static int on_msg_error(struct xio_sessi + struct xio_msg *msg, + void *cb_user_context) + { +- printf("**** [%p] message [%lu] failed. reason: %s\n", ++ printf("**** [%p] message [%" PRIu64 "] failed. reason: %s\n", + session, msg->request->sn, xio_strerror(error)); + + return 0; diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix index 1a860496a4d3..cce739046199 100644 --- a/pkgs/development/libraries/agda/categories/default.nix +++ b/pkgs/development/libraries/agda/categories/default.nix @@ -19,5 +19,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + broken = true; # doesn't work due to new agdastdlib, see #9471 }; }) diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index 2a9ee1c9c5bd..87eb1e324ce0 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -1,27 +1,31 @@ -{ stdenv, fetchurl, icmake, libmilter, libX11, openssl, readline +{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline , utillinux, yodl }: -let version = "3.25.02"; in +let version = "4.00.00"; in stdenv.mkDerivation { name = "bobcat-${version}"; - src = fetchurl { - sha256 = "0b1370li4q82fqj982vng9cwkf23k2c1df5jsdcgkrk01r53dxry"; - url = "mirror://debian/pool/main/b/bobcat/bobcat_${version}.orig.tar.gz"; + src = fetchFromGitHub { + sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs"; + rev = version; + repo = "bobcat"; + owner = "fbb-git"; }; meta = with stdenv.lib; { inherit version; description = "Brokken's Own Base Classes And Templates"; - downloadPage = http://sourceforge.net/projects/bobcat/files/; + homepage = https://fbb-git.github.io/bobcat/; license = licenses.gpl3; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; buildInputs = [ libmilter libX11 openssl readline utillinux ]; nativeBuildInputs = [ icmake yodl ]; + sourceRoot = "bobcat-${version}-src/bobcat"; + postPatch = '' substituteInPlace INSTALL.im --replace /usr $out patchShebangs ./build diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 57e518635ced..685d095a8184 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, cmake, boost, openssl }: let - version = "0.11.0"; + version = "0.11.2"; in stdenv.mkDerivation rec { name = "cpp-netlib-${version}"; src = fetchurl { - url = "http://commondatastorage.googleapis.com/cpp-netlib-downloads/${version}/${name}.tar.bz2"; - md5 = "0765cf203f451394df98e6ddf7bf2541"; + url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2"; + sha256 = "0vwnp1jpvsdjaz7f7w55p7gw6hj7694nklmljcvphvkrhbw1g1q5"; }; buildInputs = [ cmake boost openssl ]; @@ -19,9 +19,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { + inherit version; description = "A collection of open-source libraries for high level network programming"; homepage = http://cpp-netlib.org; license = licenses.boost; platforms = platforms.all; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix new file mode 100644 index 000000000000..6207f3d20382 --- /dev/null +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "dclxvi-2013-01-27"; + + src = fetchFromGitHub { + owner = "agl"; + repo = "dclxvi"; + rev = "74009d58f2305be3b95d88717619bde8ecbdd9a2"; + sha256 = "1kx4h8iv7yb30c6zjmj8zs9x12vxhi0jwkiwxsxj9swf6bww6p1g"; + }; + + buildFlags = [ "libdclxvipairing.so" ]; + + installPhase = '' + mkdir -p $out/{include,lib} + find . -name \*.h -exec cp {} $out/include \; + find . -name \*.so -exec cp {} $out/lib \; + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/agl/dclxvi"; + description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 263943411e83..654741283f95 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -230,12 +230,12 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert x11grabExtlib -> libX11 != null && libXv != null; stdenv.mkDerivation rec { - name = "ffmpeg-${version}"; - version = "2.7.1"; + name = "ffmpeg-full-${version}"; + version = "2.7.2"; src = fetchurl { - url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; + url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2"; + sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; }; patchPhase = ''patchShebangs .''; diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix index 3e4708fdf466..105239c48c9c 100644 --- a/pkgs/development/libraries/ffmpeg/2.7.nix +++ b/pkgs/development/libraries/ffmpeg/2.7.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.1"; + version = "${branch}.2"; branch = "2.7"; - sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; + sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw"; }) diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index c79c389128b2..d0fba6ed821a 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: stdenv.mkDerivation rec { - name = "freenect-${version}"; - version = "0.5.2"; - src = fetchzip { - url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz"; - sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9"; - }; + name = "freenect-${version}"; + version = "0.5.2"; - buildInputs = [ libusb freeglut mesa libXi libXmu ]; - nativeBuildInputs = [ cmake pkgconfig ]; + src = fetchzip { + url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz"; + sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9"; + }; - meta = { - description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X"; - inherit version; - homepage = http://openkinect.org; - license = with stdenv.lib.licenses; [ gpl2 asl20 ]; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; - platforms = stdenv.lib.platforms.linux; - }; + buildInputs = [ libusb freeglut mesa libXi libXmu ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + meta = { + description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X"; + inherit version; + homepage = http://openkinect.org; + license = with stdenv.lib.licenses; [ gpl2 asl20 ]; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 464d2f66e454..e3dfc9fe0a90 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "getdata-0.8.8"; + name = "getdata-0.8.9"; src = fetchurl { url = "mirror://sourceforge/getdata/${name}.tar.bz2"; - sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj"; + sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 8cab2c25fc4d..1657ceaeece6 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.5.5"; + name = "gpgme-1.6.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "01y28fkq52wwf4p470wscaxd2vgzl615irmafx3mj3380x8ksg8b"; + sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix new file mode 100644 index 000000000000..63cc74773855 --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "htmlcxx-${version}"; + version = "0.85"; + + src = fetchurl { + url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz"; + sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb"; + }; + + patches = [ ./ptrdiff.patch ]; + + meta = { + homepage = http://htmlcxx.sourceforge.net/; + description = "htmlcxx is a simple non-validating css1 and html parser for C++."; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/htmlcxx/ptrdiff.patch b/pkgs/development/libraries/htmlcxx/ptrdiff.patch new file mode 100644 index 000000000000..6348ba24f8da --- /dev/null +++ b/pkgs/development/libraries/htmlcxx/ptrdiff.patch @@ -0,0 +1,13 @@ +diff -rc htmlcxx-orig-0.85/html/tree.h htmlcxx-0.85/html/tree.h +*** htmlcxx-orig-0.85/html/tree.h 2015-09-02 13:57:17.988688798 +0200 +--- htmlcxx-0.85/html/tree.h 2015-09-02 13:57:52.737768811 +0200 +*************** +*** 45,50 **** +--- 45,51 ---- + #ifndef tree_hh_ + #define tree_hh_ + ++ #include <cstddef> + #include <cassert> + #include <memory> + #include <stdexcept> diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix new file mode 100644 index 000000000000..7bf4e746db4c --- /dev/null +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, autoreconfHook }: + +let version = "7.0.2"; in # meta.homepage might change after a major update +stdenv.mkDerivation { + name = "ip2location-c-${version}"; + + src = fetchurl { + sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx"; + url = "http://www.ip2location.com/downloads/ip2location-c-${version}.tar.gz"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + # Checks require a database, which require registration (although sample + # databases are available, downloading them for just 1 test seems excessive): + doCheck = false; + + meta = with stdenv.lib; { + inherit version; + description = "Library to look up locations of host names and IP addresses"; + longDescription = '' + A C library to find the country, region, city,coordinates, + zip code, time zone, ISP, domain name, connection type, area code, + weather, MCC, MNC, mobile brand name, elevation and usage type of + any IP address or host name in the IP2Location databases. + ''; + homepage = http://www.ip2location.com/developers/c-7; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index b398a7a11473..d14e444f298e 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -23,5 +23,6 @@ in antBuild { homepage = http://www.junit.org/; description = "A framework for repeatable tests in Java"; license = stdenv.lib.licenses.epl10; + broken = true; }; } diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix index b08f5b7dd762..d40cdf75ad17 100644 --- a/pkgs/development/libraries/jemalloc/default.nix +++ b/pkgs/development/libraries/jemalloc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "jemalloc-3.6.0"; + name = "jemalloc-4.0.0"; src = fetchurl { url = "http://www.canonware.com/download/jemalloc/${name}.tar.bz2"; - sha256 = "1zl4vxxjvhg72bdl53sl0idz9wp18c6yzjdmqcnwm09wvmcj2v71"; + sha256 = "1wiydkp8a4adwsgfsd688hpv2z7hjv5manhckchk96v6qdsbqk91"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d874d1e9ef5e..884924f643db 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.2.1"; + name = "libassuan-2.3.0"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "1pp2kl5gc2vja41g3wk03h1hgh7gxy6pj354fb5n4lrlg6xqb4ll"; + sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7"; }; buildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libassuan/git.nix b/pkgs/development/libraries/libassuan/git.nix deleted file mode 100644 index 7f77183c8432..000000000000 --- a/pkgs/development/libraries/libassuan/git.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ fetchgit, stdenv, pth, libgpgerror, autoconf, automake, libtool }: - -stdenv.mkDerivation rec { - name = "libassuan-2.1pre-git20120407"; - - src = fetchgit { - url = "git://git.gnupg.org/libassuan.git"; - rev = "5c00c7cc2901a879927a5756e1bb7ecf49439ebc"; - sha256 = "14ebcc65930360a067eea8cfbdaa5418c909bd9dfb27fe366edf78ad6c1aa69f"; - }; - - propagatedBuildInputs = [ pth libgpgerror ]; - buildInputs = [ autoconf automake libtool ]; - - doCheck = true; - - preConfigure = "autoreconf -v"; - - meta = { - description = "Libassuan, the IPC library used by GnuPG and related software"; - - longDescription = '' - Libassuan is a small library implementing the so-called Assuan - protocol. This protocol is used for IPC between most newer - GnuPG components. Both, server and client side functions are - provided. - ''; - - homepage = http://gnupg.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index d22ce9ae2bf1..4692cf6aac12 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -1,11 +1,13 @@ { stdenv, autoconf, automake, libtool, m4, fetchurl, bash, pkgconfig, sqlite }: stdenv.mkDerivation rec { - name = "libcangjie-1.1"; + name = "libcangjie-${version}"; + version = "1.4_rev_${rev}"; + rev = "a73c1d8783f7b6526fd9b2cc44a669ffa5518d3d"; src = fetchurl { - url = "https://github.com/Cangjians/libcangjie/archive/v1.1.tar.gz"; - sha256 = "1iy57vlmwgai9763adx6q4fisg2c63cmp31d1cd8mk00c222bw1z"; + url = "https://github.com/Cangjians/libcangjie/archive/${rev}.tar.gz"; + sha256 = "0i5svvcx099fc9hh5dvr3gpb1041v6vn5fnylxy82zjy239114lg"; }; buildInputs = [ automake autoconf libtool m4 pkgconfig sqlite ]; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 0083ec42ee41..cfc2c2f931ba 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.4.3"; + name = "libevdev-1.4.4"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "16wn4zb0wrqvzmgcgiafndvwh4akzdvjzgkj128fkc3qzlk8nh8w"; + sha256 = "1aa5pj2ivhvpxcbvgh80ghmzpkwyahw9a2bxi7sjhvkakcv7k6gd"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libevent/1.4.nix b/pkgs/development/libraries/libevent/1.4.nix deleted file mode 100644 index ed190bf60615..000000000000 --- a/pkgs/development/libraries/libevent/1.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchurl}: - -let version = "1.4.14b"; in -stdenv.mkDerivation { - name = "libevent-${version}"; - - src = fetchurl { - url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz"; - sha256 = "00b3wih3qpcik6v0qh1406abs2xb954d58ncqwzs8ar2d93ip9mg"; - }; - - meta = { - description = "libevent, an event notification library"; - - longDescription = - '' The libevent API provides a mechanism to execute a callback function - when a specific event occurs on a file descriptor or after a timeout - has been reached. Furthermore, libevent also support callbacks due - to signals or regular timeouts. - - libevent is meant to replace the event loop found in event driven - network servers. An application just needs to call event_dispatch() - and then add or remove events dynamically without having to change - the event loop. - ''; - - license = "mBSD"; - }; -} diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 23ccfc69df44..19a6a8531bee 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "libgpg-error-1.19"; + name = "libgpg-error-1.20"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk"; + sha256 = "08i5wxs6zlngjkv6s3dwm60w8mihxvi9agp6jfq7z6j1wdf8jrij"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 528ef71cda48..399640f6c4a1 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -15,11 +15,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-0.21.0"; + name = "libinput-1.0.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "0l7mhdr50g11hxg2pz8ihsgzbm0810syj05d3555rzhda6g7mkkw"; + sha256 = "17prgxxq95i2l8a00clwwmvvskbb9xza9fmym1jvlmxl358v6bs8"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix new file mode 100644 index 000000000000..456e1de25dfc --- /dev/null +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchhg, txt2tags }: + +stdenv.mkDerivation rec { + rev = "148"; + version = "hg-2012-12-02"; + name = "libixp-${version}"; + + src = fetchhg { + url = https://code.google.com/p/libixp/; + sha256 = "1nbnh2ff18fsrs28mx4bfgncq1d1nw5dd6iwhwvv5x2g9w7q5vvj"; + inherit rev; + }; + + configurePhase = '' + sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk + ''; + + buildInputs = [ txt2tags ]; + + meta = { + homepage = https://code.google.com/p/libixp/; + description = "Portable, simple C-language 9P client and server libary"; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + license = stdenv.lib.licenses.mit; + inherit version; + }; +} diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix deleted file mode 100644 index cbe9e20f0b1b..000000000000 --- a/pkgs/development/libraries/libixp_for_wmii/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -args: with args; -stdenv.mkDerivation { - name = "libixp_for_wmii-0.4"; - phases = "unpackPhase installPhase"; - installPhase = " - export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g') - sed -i -e \"s%^PREFIX.*%PREFIX=\$out%\" \\ - -e \"s%^\\(INCLUDE.*\\)%\\1 \$NIX_CFLAGS_COMPILE%\" \\ - -e \"s%^\\(LIBS.*\\)%\\1 \$LDFLAGS%\" \\ - config.mk - make - mkdir -p \$out/include - cp -r include/*.h \$out/include - cp -r lib \$out - "; - src = fetchurl { - url = http://dl.suckless.org/libs/libixp-0.4.tar.gz; - sha256 = "0b44p9wvmzxpyf2xd86rxyr49bmfh9cd5hj3d234gkvynvgph60p"; - }; - - meta = { - homepage = http://libs.suckless.org/libixp; - description = "stand-alone client/server 9P library"; - license = with stdenv.lib.licenses; [ mit lpl-102 ]; - }; -} diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 010318073c7a..dd17f7a4c008 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.76"; + version = "0.7.77"; name = "libmediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "088hxj3x12ww8zym3g6izz1w9m6wxgdy7hc2m089cd4sv9dlccnq"; + sha256 = "1znxdn1jpqkiwshq9s514ak1z9wkrh9flky4s3q8z2xl68jpralq"; }; buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 883ba807edad..334c5558e2b1 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc -, icu, libxslt, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, docbook_xsl, gtk_doc, icu +, libxslt, pkgconfig }: let version = "${libVersion}-list-${listVersion}"; - listVersion = "2015-08-07"; - listArchive = let - rev = "de9af76664aa5fd89dfee3c44c56ba91c03eefab"; - in fetchurl { - sha256 = "007yxs92dffgapkqik6rfrng5af8hjzf8wd7hlff91q836k40abi"; - url = "https://codeload.github.com/publicsuffix/list/tar.gz/${rev}"; + listVersion = "2015-09-07"; + listSources = fetchFromGitHub { + sha256 = "0inpdixg967ibi5f41jq15l6r027lj2y5q0ymlfrp9b29gfay50n"; + rev = "ee621394b6d863dcc2ff89956d91cdd7d15d8c9d"; + repo = "list"; + owner = "publicsuffix"; }; libVersion = "0.8.0"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation { preConfigure = '' # The libpsl check phase requires the list's test scripts (tests/) as well - tar --directory=list --strip-components=1 -xf "${listArchive}" + cp -Rv "${listSources}"/* list ''; configureFlags = "--disable-static --enable-gtk-doc --enable-man"; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d272ad184925..3d564fc00f8b 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libraw-${version}"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i"; + sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6"; }; buildInputs = [ lcms2 jasper ] ; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = http://www.libraw.org/; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/libunwind/cve-2015-3239.patch b/pkgs/development/libraries/libunwind/cve-2015-3239.patch new file mode 100644 index 000000000000..247b2dab44f8 --- /dev/null +++ b/pkgs/development/libraries/libunwind/cve-2015-3239.patch @@ -0,0 +1,15 @@ +http://git.savannah.gnu.org/cgit/libunwind.git/commit/?id=396b6c7ab737e2bff244d640601c436a26260ca1 + +diff --git a/include/dwarf_i.h b/include/dwarf_i.h +index 0e72845..86dcdb8 100644 +--- a/include/dwarf_i.h ++++ b/include/dwarf_i.h +@@ -20,7 +20,7 @@ + extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH]; + /* REG is evaluated multiple times; it better be side-effects free! */ + # define dwarf_to_unw_regnum(reg) \ +- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) ++ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0) + #endif + + #ifdef UNW_LOCAL_ONLY diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 91895114ea0c..ecaa643b143f 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libunwind-1.1"; - + src = fetchurl { url = "mirror://savannah/libunwind/${name}.tar.gz"; sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; }; - patches = [ ./libunwind-1.1-lzma.patch ]; + patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ]; postPatch = '' sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file done ''; - + meta = with stdenv.lib; { homepage = http://www.nongnu.org/libunwind; description = "A portable and efficient API to determine the call-chain of a program"; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index a6da96dc863e..6c5d5a91ad88 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-1.1"; + name = "libvdpau-1.1.1"; src = fetchurl { - url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "069r4qc934xw3z20hpmg0gx0al7fl1kdik1r46x2dgr0ya1yg95f"; + url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.bz2"; + sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736"; }; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 31cd0bac4216..28bb6bc09bf0 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -5,7 +5,7 @@ , pythonPackages, perlPackages }: -let version = "1.2.17"; in +let version = "1.2.18"; in assert version == pythonPackages.libvirt.version; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "1b9gs3fj6bv9ig3kqmip2ivvsprymi6sslrvp82sw3srn0hayzp0"; + sha256 = "1pkaxcg77izi1yzjc0wjav985dr11bx2hvcqxlgx5kjcmwcgz9fm"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index 8abacf6f1c87..6c3314e09230 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }: stdenv.mkDerivation rec { - name = "libxkbcommon-0.4.3"; + name = "libxkbcommon-0.5.0"; src = fetchurl { url = "http://xkbcommon.org/download/${name}.tar.xz"; - sha1 = "2251adc7425c816ec7af4f1c3776a619a53293b6"; + sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi"; }; buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index fbf817dd8730..02c07a78acb2 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lmdb-${version}"; - version = "0.9.15"; + version = "0.9.16"; src = fetchzip { url = "https://github.com/LMDB/lmdb/archive/LMDB_${version}.tar.gz"; - sha256 = "0p79fpyh1yx2jg1f0kag5zsdn4spkgs1j3dxibvqdy32wkbpxd0g"; + sha256 = "1lkmngscijwiz09gdkqygdp87x55vp8gb4fh4vq7s34k4jv0327l"; }; postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; diff --git a/pkgs/development/libraries/nettle/27.nix b/pkgs/development/libraries/nettle/27.nix deleted file mode 100644 index fc85f5eb9dec..000000000000 --- a/pkgs/development/libraries/nettle/27.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, fetchurl, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "2.7.1"; - - src = fetchurl { - url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "0h2vap31yvi1a438d36lg1r1nllfx3y19r4rfxv7slrm6kafnwdw"; - }; -}) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 9681c4d7eeed..c4257fe97d28 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -34,12 +34,12 @@ let in stdenv.mkDerivation rec { name = "${prefix}nghttp2-${version}"; - version = "1.1.2"; + version = "1.2.1"; # Don't use fetchFromGitHub since this needs a bootstrap curl src = fetchurl { url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2"; - sha256 = "5b218a0d27eeaa6898eb0757b6bbcc643ada2148696d864f185b3123c392904b"; + sha256 = "8027461a231d205394890b2fee34d1c3751e28e7d3f7c1ebc1b557993ea4045e"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix new file mode 100644 index 000000000000..eed77b9113a4 --- /dev/null +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg +, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip +, enableBloat ? false }: + +let v = "3.0.0"; in + +stdenv.mkDerivation rec { + name = "opencv-${v}"; + + src = fetchurl { + url = "https://github.com/Itseez/opencv/archive/${v}.zip"; + sha256 = "00dh7wvgkflz22liqd10fma8m3395lb3l3rgawnn5wlnz6i4w287"; + }; + + buildInputs = + [ unzip libjpeg libpng libtiff ] + ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; + + nativeBuildInputs = [ cmake pkgconfig ]; + + # TODO: Pre-download IPP so that OpenCV doesn't try to download it itself + # (which fails). + cmakeFlags = [ "-DWITH_IPP=OFF" ]; + + enableParallelBuilding = true; + + meta = { + description = "Open Computer Vision Library with more than 500 algorithms"; + homepage = http://opencv.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [viric flosse]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 4b8cedd90c73..a165c539ae8f 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ maintainers.linus ]; repositories.git = git://github.com/imneme/pcg-c.git; + broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix new file mode 100644 index 000000000000..153d3ce8e80f --- /dev/null +++ b/pkgs/development/libraries/pugixml/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, cmake }: + +stdenv.mkDerivation rec { + name = "pugixml-${version}"; + version = "1.6"; + + src = fetchurl { + url = "https://github.com/zeux/pugixml/releases/download/v${version}/${name}.tar.gz"; + sha256 = "1pnrdi8n9fdclmhxri3jwc6xwpgvblbjnqkk9ykycpnljv20ads7"; + }; + + nativeBuildInputs = [ cmake ]; + + sourceRoot = "${name}/scripts"; + + preConfigure = '' + # Enable long long support (required for filezilla) + sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp + ''; + + meta = with stdenv.lib; { + description = "Light-weight, simple and fast XML parser for C++ with XPath support"; + homepage = http://pugixml.org/; + license = licenses.mit; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch new file mode 100644 index 000000000000..94a031d12574 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Ensure Qt knows where libGL is. + +Author: Bjørn Forsman <bjorn.forsman@gmail.com> +diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf +--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 ++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 +@@ -13,7 +13,7 @@ + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = + QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 7f4e0b60c2d0..d1a049d78a72 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation rec { (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) ./0013-qtwebkit-glib-2.44.patch - ]; + ] ++ optional mesaSupported + (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; }); preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch new file mode 100644 index 000000000000..94a031d12574 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Ensure Qt knows where libGL is. + +Author: Bjørn Forsman <bjorn.forsman@gmail.com> +diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf +--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 ++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 +@@ -13,7 +13,7 @@ + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = + QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 6ec57787e224..2e4a1c1c161a 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -71,7 +71,8 @@ stdenv.mkDerivation { (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) ./0013-xdg_config_dirs.patch - ] + ] ++ optional mesaSupported + (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; }) ++ (optional decryptSslTraffic ./0100-ssl.patch); preConfigure = '' diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix new file mode 100644 index 000000000000..01ddbf314282 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -0,0 +1,31 @@ +{ runCommand, lndir }: + +{ paths, qtbase }: + +runCommand "qt-env" { inherit paths qtbase; } '' + +mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" + +cp "$qtbase/bin/qmake" "$out/bin" +cat >"$out/bin/qt.conf" <<EOF +[Paths] +Prefix = $out +Plugins = lib/qt5/plugins +Imports = lib/qt5/imports +Qml2Imports = lib/qt5/qml +Documentation = share/doc/qt5 +EOF + +for path in $paths; do + if [[ -d "$path/mkspecs" ]]; then + ${lndir}/bin/lndir -silent "$path/mkspecs" "$out/mkspecs" + + for dir in bin include lib share; do + if [[ -d "$path/$dir" ]]; then + ${lndir}/bin/lndir -silent "$path/$dir" "$out/$dir" + fi + done + fi +done + +'' diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index c5db97877065..1ea903400219 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { name = "rocksdb-${version}"; - version = "3.12.1"; + version = "3.13.1"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "rocksdb-${version}"; - sha256 = "0692jlnakwd5c1h6czd3l7rxhz514whpixyd8y805bnkj2ag61sa"; + sha256 = "1jw2sjvpixz565wvmgls4rly3wylcmyypka4pvd9mhxkq8d699h9"; }; buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ]; diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix index 07fffeff20d6..0ec6342c39e6 100644 --- a/pkgs/development/libraries/uid_wrapper/default.nix +++ b/pkgs/development/libraries/uid_wrapper/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "uid_wrapper-1.1.0"; + name = "uid_wrapper-1.1.1"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn"; + sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9"; }; - buildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { description = "a wrapper for the user, group and hosts NSS API"; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index e7dc0d4982c4..0e67f5d3d1ad 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.8.3"; + version = "2.8.5"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -25,13 +25,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk"; + sha256 = "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx"; }; patches = [ ./finding-harfbuzz-icu.patch ]; cmakeFlags = [ "-DPORT=GTK" ]; + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base}/include/gstreamer-1.0"; + nativeBuildInputs = [ cmake perl python ruby bison gperf sqlite pkgconfig gettext gobjectIntrospection diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 41f73b2f8346..b3555d7fddbb 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { platforms = ocaml.meta.platforms; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; + broken = stdenv.isi686; # https://github.com/mirleft/ocaml-asn1-combinators/issues/13 }; } diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix index da4bcdcb527a..beaf2fc7fd18 100644 --- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix +++ b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix @@ -8,7 +8,7 @@ buildOcaml rec { sha256 = "0mapzn2ls5qcrzjm1az50lqjj76ldkmz4fbv2phc9w6smab50qy5"; }; - patches = [ ./camlp4.patch ./meta.patch ]; + patches = [ ./camlp4.patch ./meta.patch ./srcdir.patch ]; buildInputs = [time]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index ae01cf9d7b5e..2dc1b515c033 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -9,7 +9,7 @@ buildOcaml rec { sha256 = "1lh97qf1b7mq64pxkphr2w91ri5hfwg58cpjb2xd8a453c9jylw4"; }; - patches = [ ./camlp4-git.patch ./meta.patch ]; + patches = [ ./camlp4-git.patch ./meta.patch ./srcdir.patch ]; buildInputs = [time autoconf automake]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/bitstring/srcdir.patch b/pkgs/development/ocaml-modules/bitstring/srcdir.patch new file mode 100644 index 000000000000..d53760f1d6f6 --- /dev/null +++ b/pkgs/development/ocaml-modules/bitstring/srcdir.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2015-09-01 06:32:15.111441188 +0200 ++++ b/Makefile.in 2015-09-01 06:32:56.001084480 +0200 +@@ -125,7 +125,7 @@ + + byteswap.h: byteswap.in.h + { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +- cat $(srcdir)/byteswap.in.h; \ ++ cat $(top_srcdir)/byteswap.in.h; \ + } > $@-t + mv -f $@-t $@ + diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index 04f7e434a54b..68a56dedc3a5 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -4,12 +4,13 @@ stdenv.mkDerivation rec { name = "pycangjie-${version}"; - version = "1.0"; + version = "1.3_rev_${rev}"; + rev = "361bb413203fd43bab624d98edf6f7d20ce6bfd3"; src = fetchurl { name = "${name}.tar.gz"; - url = "https://github.com/Cangjians/pycangjie/archive/v${version}.tar.gz"; - sha256 = "1wx0m0chcpgxhj6cdxrwyi8hq05xlbap1ifs0wzb6nkglir0sb4j"; + url = "https://github.com/Cangjians/pycangjie/archive/${rev}.tar.gz"; + sha256 = "12yi09nyffmn4va7lzk4irw349qzlbxgsnb89dh15cnw0xmrin05"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index f6030bb9526e..57c455f851c5 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "18.0.1"; + version = "18.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "152b4qlpqc54939vfx5ipjpgx0kln02n3ywpm6x25pqysngwjjad"; + sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509"; }; buildInputs = [ python wrapPython distutils-cfg ]; @@ -35,5 +35,5 @@ stdenv.mkDerivation rec { homepage = http://pypi.python.org/pypi/setuptools; license = [ "PSF" "ZPL" ]; platforms = platforms.all; - }; + }; } diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 199df25d5523..8dabd3347fc8 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }: +{ stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }: with stdenv.lib; @@ -9,31 +9,21 @@ let in stdenv.mkDerivation rec { - # The package name depends on wether we are just building the QtCreator package or the whole Qt SDK - # If we are building the QtCreator package: qtcreator-version - # If we are building the QtSDK package, the Qt version is also included: qtsdk-version-qt-version - name = "qt${if sdkBuild then "sdk" else "creator"}-${version}" - + optionalString sdkBuild "-qt-${qtLib.version}"; + name = "qtcreator-${version}"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm"; }; - # This property can be used in a nix development environment to refer to the Qt package - # eg: export QTDIR=${qtSDK.qt} - qt = qtLib; - - # We must only propagate Qt (including qmake) when building the QtSDK - propagatedBuildInputs = if sdkBuild then [ qtLib ] else []; - buildInputs = if sdkBuild == false then [ qtLib ] else []; + buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ]; doCheck = false; enableParallelBuilding = true; preConfigure = '' - qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro + qmake -spec linux-g++ qtcreator.pro ''; buildFlags = optionalString withDocumentation " docs"; @@ -54,6 +44,12 @@ stdenv.mkDerivation rec { Type=Application Categories=Qt;Development;IDE; __EOF__ + # Wrap the qtcreator binary + addToSearchPath QML2_IMPORT_PATH "${qtLib.quickcontrols}/lib/qt5/qml" + wrapProgram $out/bin/qtcreator \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" ''; meta = { @@ -63,9 +59,9 @@ stdenv.mkDerivation rec { tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; + homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.bbenoist ]; + maintainers = [ maintainers.akaWolf maintainers.bbenoist ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 5817edbf2e35..53eeb8c68c32 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.9"; + version = "6.10.1"; name = "checkstyle-${version}"; src = fetchurl { url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz"; - sha256 = "122lzqai6nb1wx9z9hc92sld9ghrynywf4f4lz6wk50kywcp0p70"; + sha256 = "18axx444hzi1gcbqa7nyifdvyqsiab0asya4qwa7y6khiq7y3myb"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 893ac521307b..b0e021f54cc7 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ocaml, libelf }: stdenv.mkDerivation rec { - version = "0.13.1"; + version = "0.14.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1p7rzhvmz9y7ii2z05mfdb49i45f82kx8c9ywciwqma06zycvd80"; + sha256 = "02adbn2h5bfc4drcpbalq7acx573a657ik3008fr8s9qyqdp2nl6"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 3c59bf45effe..da127b2f8eef 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19"; }) ./linux-4.0.patch]; + outputs = [ "out" "doc" ]; + # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 476d2cb8ac52..b15c9065e0ec 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.9.4"; in +let version = "1.9.6"; in stdenv.mkDerivation { name = "ant-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1kw801p8h5x4f0g8i5yknppssrj5a3xy1aqrkpfnk22bd1snbh90"; + sha256 = "1cwd5vq175gyicw0hkm8idwa33zxwhf7xlxywaqxcqqdjql0jfx4"; }; contrib = fetchurl { diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix new file mode 100644 index 000000000000..7f5caf7e6486 --- /dev/null +++ b/pkgs/development/tools/build-managers/gup/build.nix @@ -0,0 +1,16 @@ +# NOTE: this file is copied from the upstream repository for this package. +# Please submit any changes you make here to https://github.com/gfxmonk/gup/ + +{ stdenv, lib, python, which, pychecker ? null }: +{ src, version, meta ? {} }: +stdenv.mkDerivation { + inherit src meta; + name = "gup-${version}"; + buildInputs = lib.remove null [ python which pychecker ]; + SKIP_PYCHECKER = pychecker == null; + buildPhase = "make python"; + installPhase = '' + mkdir $out + cp -r python/bin $out/bin + ''; +} diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix new file mode 100644 index 000000000000..dc6f1f8d0023 --- /dev/null +++ b/pkgs/development/tools/build-managers/gup/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchgit, lib, python, which }: +let + version = "0.5.1"; + src = fetchgit { + url = "https://github.com/gfxmonk/gup.git"; + rev = "f185052e2177ed5e46720e6c6cfb529b96cd17e2"; + sha256 = "c2e27cdba2231017ceb4868f58f5c3b224be0491b81558b4e59bb08a952ad1a5"; + }; +in +import ./build.nix + { inherit stdenv lib python which; } + { inherit src version; + meta = { + description = "A better make, inspired by djb's redo"; + homepage = https://github.com/gfxmonk/gup; + license = stdenv.lib.licenses.lgpl2Plus; + maintainers = [ stdenv.lib.maintainers.gfxmonk ]; + platforms = stdenv.lib.platforms.all; + }; + } diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index d83ae51aaaad..181a00ce7e14 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -1,28 +1,37 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +let version = "7.22.01"; in +stdenv.mkDerivation { name = "icmake-${version}"; - version = "7.22.01"; - src = fetchurl { - url = "mirror://sourceforge/icmake/icmake_${version}.orig.tar.gz"; - sha256 = "1iv6p9cyvr9i2sjhklplr65llg1ycxqy7z4dfgn0nkwxgs9yf8mm"; + src = fetchFromGitHub { + sha256 = "1pgl8bami4v86ja40in4fsdx940f6q85l1s4b9k53zl29pm85v5k"; + rev = version; + repo = "icmake"; + owner = "fbb-git"; }; + sourceRoot = "icmake-${version}-src/icmake"; + preConfigure = '' patchShebangs ./ - sed -i "s;usr/;;g" INSTALL.im + substituteInPlace INSTALL.im --replace "usr/" "" ''; - buildPhase = "./icm_bootstrap $out"; + buildPhase = '' + ./icm_bootstrap $out + ''; - installPhase = "./icm_install all /"; + installPhase = '' + ./icm_install all / + ''; meta = with stdenv.lib; { + inherit version; description = "A program maintenance (make) utility using a C-like grammar"; - homepage = http://icmake.sourceforge.net/; + homepage = https://fbb-git.github.io/icmake/; license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ nckx pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 9e54be8aa90f..a2b79d77e22c 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.5"; + version = "2.3.6"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "0hlwkrr5fkjpjgmwipp9a2bnc9riqks2pjc3rvjsq0a8j7hr72ca"; + sha256 = "1pq44h0ndclbrwvx901zih63jnzqsyyr865zlml40klg3lssmbcq"; }; buildInputs = [python makeWrapper]; diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix new file mode 100644 index 000000000000..f7e95503d063 --- /dev/null +++ b/pkgs/development/tools/github/github-release/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl }: + +let + linuxPredicate = stdenv.system == "x86_64-linux"; + bsdPredicate = stdenv.system == "x86_64-freebsd"; + darwinPredicate = stdenv.system == "x86_64-darwin"; + metadata = assert linuxPredicate || bsdPredicate || darwinPredicate; + if linuxPredicate then + { arch = "linux-amd64"; + sha256 = "0b3h0d0qsrjx99kcd2cf71xijh44wm5rpm2sr54snh3f7macj2p1"; + archiveBinaryPath = "linux/amd64"; } + else if bsdPredicate then + { arch = "freebsd-amd64"; + sha256 = "1yydm4ndkh80phiwk41kcf6pizvwrfhsfk3jwrrgr42wsnkkgj0q"; + archiveBinaryPath = "freebsd/amd64"; } + else + { arch = "darwin-amd64"; + sha256 = "1dj74cf1ahihia2dr9ii9ky0cpmywn42z2iq1vkbrrcggjvyrnlf"; + archiveBinaryPath = "darwin/amd64"; }; +in stdenv.mkDerivation rec { + shortname = "github-release"; + name = "${shortname}-${version}"; + version = "0.6.2"; + + src = fetchurl { + url = "https://github.com/aktau/github-release/releases/download/v${version}/${metadata.arch}-${shortname}.tar.bz2"; + sha256 = metadata.sha256; + }; + + buildInputs = [ ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p "$out/bin" + cp "${metadata.archiveBinaryPath}/github-release" "$out/bin/" + ''; + + meta = with stdenv.lib; { + description = "Commandline app to create and edit releases on Github (and upload artifacts)"; + longDescription = '' + A small commandline app written in Go that allows you to easily create and + delete releases of your projects on Github. + In addition it allows you to attach files to those releases. + ''; + + license = licenses.mit; + homepage = https://github.com/aktau/github-release; + maintainers = with maintainers; [ ardumont ]; + }; +} diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix deleted file mode 100644 index 96dc059ae3f4..000000000000 --- a/pkgs/development/tools/gocode/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "9b760fdb16f18eafbe0cd274527efd2bd89dfa78"; - name = "gocode-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/nsf/gocode"; - src = fetchFromGitHub { - inherit rev; - owner = "nsf"; - repo = "gocode"; - sha256 = "0d1wl0x8jkaav6lcfzs70cr6gy0p88cbk5n3p19l6d0h9xz464ax"; - }; - - subPackages = [ "./" ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "An autocompletion daemon for the Go programming language"; - homepage = https://github.com/nsf/gocode; - license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix deleted file mode 100644 index 2a8c897ce5ba..000000000000 --- a/pkgs/development/tools/goimports/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "7534f4943d94a318edde90212439e538ed54cdde"; - version = "git-2015-04-26"; - name = "goimports-${version}"; - goPackagePath = "golang.org/x/tools"; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "tools"; - sha256 = "12ybykrn92l7awav0wkx9yqpc5z0pdwwi29qs9mdr2xspx61rb50"; - }; - - subPackages = [ "cmd/goimports" ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "Import management tool for go"; - homepage = https://godoc.org/golang.org/x/tools/cmd/goimports; - license = licenses.bsd3; - maintainers = with maintainers; [ jzellner ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix deleted file mode 100644 index 8ba61f793d7b..000000000000 --- a/pkgs/development/tools/gotags/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "a60c6a1b171faedc44354bd437d965e5e3bdc220"; - name = "gotags-${lib.strings.substring 0 7 rev}"; - - goPackagePath = "github.com/jstemmer/gotags"; - - src = fetchFromGitHub { - inherit rev; - owner = "jstemmer"; - repo = "gotags"; - sha256 = "1drbypby0isdmkq44jmlv59k3jrwvq2jciaccxx2qc2nnx444fkq"; - }; - - dontInstallSrc = true; - - meta = with lib; { - description = "Ctags-compatible tag generator for Go"; - homepage = https://github.com/nsf/gotags; - license = licenses.mit; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index 59b7bdb248e4..bafde1f96873 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -3,6 +3,7 @@ buildPythonPackage rec { name = "grabserial-20141120"; + namePrefix = ""; src = fetchgit { url = https://github.com/tbird20d/grabserial.git; diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix new file mode 100644 index 000000000000..c7cc21a823c0 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix @@ -0,0 +1,36 @@ +{ mkDerivation, ansi-wl-pprint, base, Cabal, containers, distribution-nixpkgs +, fetchFromGitHub, language-nix, lens, optparse-applicative, pretty, pretty-show +, stdenv, nix-prefetch-scripts, makeWrapper +}: + +mkDerivation rec { + pname = "cabal2nix"; + version = "20150903"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + }; + postUnpack = "sourceRoot+=/${pname}"; + isLibrary = false; + isExecutable = true; + enableSharedExecutables = false; + executableHaskellDepends = [ + ansi-wl-pprint base Cabal containers distribution-nixpkgs + language-nix lens optparse-applicative pretty pretty-show + ]; + executableToolDepends = [ makeWrapper ]; + postInstall = '' + exe=$out/libexec/${pname}-${version}/${pname} + install -D $out/bin/${pname} $exe + rm -rf $out/{bin,lib,share} + makeWrapper $exe $out/bin/${pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin" + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname} + ''; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix deleted file mode 100644 index b1bd535c5fd6..000000000000 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ mkDerivation, fetchgit, aeson, ansi-wl-pprint, base, bytestring, Cabal -, containers, deepseq, deepseq-generics, directory, doctest, filepath -, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl -, optparse-applicative, pretty, process, QuickCheck, regex-posix, SHA, split -, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel, data-default -, nix-prefetch-scripts -}: - -mkDerivation rec { - pname = "cabal2nix"; - version = "20150824"; - src = fetchgit { - url = "http://github.com/NixOS/cabal2nix.git"; - rev = "560fb2b1d22f4c995a526529bb034bd183e85a31"; - sha256 = "0qaa0l23lc8677wvbgz327yvfg2pxxmvrxga6568ra5kgdy4204c"; - deepClone = true; - }; - isLibrary = false; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers - deepseq-generics directory filepath hackage-db lens monad-par - monad-par-extras mtl optparse-applicative pretty process - regex-posix SHA split transformers utf8-string data-default - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers - deepseq-generics directory filepath hackage-db lens monad-par - monad-par-extras mtl optparse-applicative pretty process - regex-posix SHA split transformers utf8-string data-default - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers deepseq - deepseq-generics directory doctest filepath hackage-db hspec lens - monad-par monad-par-extras mtl optparse-applicative pretty process - QuickCheck regex-posix SHA split transformers utf8-string data-default - ]; - buildDepends = [ cartel ]; - buildTools = [ gitMinimal makeWrapper ]; - preConfigure = '' - git reset --hard # Re-create the index that fetchgit destroyed in the name of predictable hashes. - runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal - ''; - postInstall = '' - exe=$out/libexec/${pname}-${version}/cabal2nix - install -D $out/bin/cabal2nix $exe - rm -rf $out/{bin,lib,share} - makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin" - mkdir -p $out/share/bash-completion/completions - $exe --bash-completion-script $exe >$out/share/bash-completion/completions/cabal2nix - ''; - homepage = "http://github.com/NixOS/cabal2nix/"; - description = "Convert Cabal files into Nix build instructions"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix new file mode 100644 index 000000000000..694b452dd816 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix @@ -0,0 +1,31 @@ +{ mkDerivation, aeson, base, bytestring, Cabal, containers, deepseq +, deepseq-generics, directory, doctest, fetchFromGitHub, filepath +, hackage-db, hspec, language-nix, lens, pretty, process, SHA +, split, stdenv, transformers, utf8-string +}: + +mkDerivation rec { + pname = "distribution-nixpkgs"; + version = "20150903"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + }; + postUnpack = "sourceRoot+=/${pname}"; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq deepseq-generics + directory doctest filepath hackage-db hspec language-nix lens + pretty process SHA split transformers utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers deepseq deepseq-generics + directory doctest filepath hackage-db hspec language-nix lens + pretty process SHA split transformers utf8-string + ]; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix new file mode 100644 index 000000000000..0f7a31652da9 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix @@ -0,0 +1,32 @@ +{ mkDerivation, base, Cabal, containers, distribution-nixpkgs +, fetchFromGitHub, filepath, language-nix, lens, monad-par +, monad-par-extras, mtl, optparse-applicative, pretty, stdenv +}: + +mkDerivation rec { + pname = "hackage2nix"; + version = "20150903"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + }; + postUnpack = "sourceRoot+=/${pname}"; + isLibrary = false; + isExecutable = true; + enableSharedExecutables = false; + executableHaskellDepends = [ + base Cabal containers distribution-nixpkgs filepath language-nix + lens monad-par monad-par-extras mtl optparse-applicative pretty + ]; + postInstall = '' + exe=$out/bin/${pname} + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${pname} + ''; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Convert Cabal files into Nix build instructions"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/cabal2nix/language-nix.nix b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix new file mode 100644 index 000000000000..b1034cb0a6c7 --- /dev/null +++ b/pkgs/development/tools/haskell/cabal2nix/language-nix.nix @@ -0,0 +1,25 @@ +{ mkDerivation, base, deepseq, doctest, fetchFromGitHub, lens +, pretty, QuickCheck, regex-posix, stdenv +}: + +mkDerivation rec { + pname = "language-nix"; + version = "20150903"; + src = fetchFromGitHub { + owner = "nixos"; + repo = "cabal2nix"; + rev = "v${version}"; + sha256 = "1cniaymgwz96bjchan49jv627wjbymc3vs48w1p19qj2k9rly6q7"; + }; + postUnpack = "sourceRoot+=/${pname}"; + libraryHaskellDepends = [ + base deepseq doctest lens pretty QuickCheck regex-posix + ]; + testHaskellDepends = [ + base deepseq doctest lens pretty QuickCheck regex-posix + ]; + homepage = "https://github.com/nixos/cabal2nix#readme"; + description = "Data types and useful functions to represent and manipulate the Nix language"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ simons ]; +} diff --git a/pkgs/development/tools/haskell/lambdabot/custom-config.patch b/pkgs/development/tools/haskell/lambdabot/custom-config.patch new file mode 100644 index 000000000000..db467f8dd29b --- /dev/null +++ b/pkgs/development/tools/haskell/lambdabot/custom-config.patch @@ -0,0 +1,49 @@ +diff --git a/src/Main.hs b/src/Main.hs +index 61da2f3..39e5c9b 100644 +--- a/src/Main.hs ++++ b/src/Main.hs +@@ -73,11 +73,14 @@ main = do + config' <- sequence config + dir <- P.getDataDir + exitWith <=< lambdabotMain modulesInfo $ +- [dataDir ==> dir, lbVersion ==> P.version] ++ config' ++ [dataDir ==> dir, lbVersion ==> P.version] ++ configInfo ++ config' + + -- special online target for ghci use + online :: [String] -> IO () + online strs = do + dir <- P.getDataDir +- void $ lambdabotMain modulesInfo +- [dataDir ==> dir, lbVersion ==> P.version, onStartupCmds ==> strs] ++ void $ lambdabotMain modulesInfo $ ++ [dataDir ==> dir, lbVersion ==> P.version, onStartupCmds ==> strs] ++ configInfo ++ ++configInfo :: [DSum Config Identity] ++configInfo = @config@ +diff --git a/src/Modules.hs b/src/Modules.hs +index 036ea1f..eaafa50 100644 +--- a/src/Modules.hs ++++ b/src/Modules.hs +@@ -14,10 +14,15 @@ import Lambdabot.Plugin.Reference + import Lambdabot.Plugin.Social + + modulesInfo :: Modules +-modulesInfo = $(modules $ corePlugins +- ++ haskellPlugins +- ++ ["irc", "localtime", "topic"] -- ircPlugins +- ++ ["dummy", "fresh", "todo"] -- miscPlugins +- ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] -- noveltyPlugins +- ++ referencePlugins +- ++ socialPlugins) ++modulesInfo = ++ $(modules $ ++ let oldDefaultModules = ++ corePlugins ++ ++ haskellPlugins ++ ++ ["irc", "localtime", "topic"] -- ircPlugins ++ ++ ["dummy", "fresh", "todo"] -- miscPlugins ++ ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] -- noveltyPlugins ++ ++ referencePlugins ++ ++ socialPlugins ++ in @modules@ ++ ) diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix index f2462ed54e17..01dfe339d141 100644 --- a/pkgs/development/tools/haskell/lambdabot/default.nix +++ b/pkgs/development/tools/haskell/lambdabot/default.nix @@ -1,16 +1,9 @@ -{ lib, makeWrapper, haskellngPackages +{ lib, haskell-lib, fetchpatch, makeWrapper, haskellPackages , mueval , withDjinn ? true , aspell ? null , packages ? (pkgs: []) -, modules ? '' - haskellPlugins - ++ ["irc", "localtime", "topic"] - ++ ["dummy", "fresh", "todo"] - ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"] - ++ referencePlugins - ++ socialPlugins -'' +, modules ? "oldDefaultModules" , configuration ? "[]" }: @@ -18,34 +11,32 @@ let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ packages pkgs; mueval' = mueval.override { - inherit haskellngPackages; + inherit haskellPackages; packages = allPkgs; }; bins = lib.makeSearchPath "bin" ([ mueval' - (haskellngPackages.ghcWithPackages allPkgs) - haskellngPackages.unlambda - haskellngPackages.brainfuck + (haskellPackages.ghcWithPackages allPkgs) + haskellPackages.unlambda + haskellPackages.brainfuck ] - ++ lib.optional withDjinn haskellngPackages.djinn + ++ lib.optional withDjinn haskellPackages.djinn ++ lib.optional (aspell != null) aspell ); - modulesStr = lib.replaceChars ["\n"] [" "] ("corePlugins ++ " + modules); + modulesStr = lib.replaceChars ["\n"] [" "] modules; configStr = lib.replaceChars ["\n"] [" "] configuration; -in lib.overrideDerivation haskellngPackages.lambdabot (self: { +in haskell-lib.overrideCabal haskellPackages.lambdabot (self: { + patches = (self.patches or []) ++ [ ./custom-config.patch ]; postPatch = (self.postPatch or "") + '' - sed -i 's/\(\$(modules \$ \).*/\1@modules@)/; /@modules@/q' src/Modules.hs - # not via sed to avoid escaping issues - substituteInPlace src/Modules.hs \ - --replace '@modules@' '${modulesStr}' - sed -i 's/\[dataDir :=> dir\]/@config@ ++ \0/' src/Main.hs substituteInPlace src/Main.hs \ --replace '@config@' '${configStr}' + substituteInPlace src/Modules.hs \ + --replace '@modules@' '${modulesStr}' ''; - buildInputs = self.buildInputs ++ [ makeWrapper ]; + buildTools = (self.buildTools or []) ++ [ makeWrapper ]; - postInstall = (self.postInstall or "") + lib.optionalString (bins != "") '' + postInstall = (self.postInstall or "") + '' wrapProgram $out/bin/lambdabot \ --prefix PATH ":" '${bins}' ''; diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix index aa445238f225..3b4a6406f703 100644 --- a/pkgs/development/tools/haskell/mueval/default.nix +++ b/pkgs/development/tools/haskell/mueval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, haskellngPackages, packages ? (pkgs: []) +{ stdenv, makeWrapper, haskellPackages, packages ? (pkgs: []) }: let defaultPkgs = pkgs: [ pkgs.show @@ -6,14 +6,14 @@ let defaultPkgs = pkgs: [ pkgs.show pkgs.QuickCheck pkgs.mtl ]; - env = haskellngPackages.ghcWithPackages + env = haskellPackages.ghcWithPackages (pkgs: defaultPkgs pkgs ++ packages pkgs); libDir = "${env}/lib/ghc-${env.version}"; in stdenv.mkDerivation { name = "mueval-env"; - inherit (haskellngPackages) mueval; + inherit (haskellPackages) mueval; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/go-repo-root/default.nix b/pkgs/development/tools/misc/go-repo-root/default.nix deleted file mode 100644 index 16520ee0457f..000000000000 --- a/pkgs/development/tools/misc/go-repo-root/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -let - version = "0.0.1"; -in - -with lib; with goPackages; -buildGoPackage rec { - name = "go-repo-root-${version}"; - goPackagePath = "github.com/cstrahan/go-repo-root"; - src = fetchFromGitHub { - owner = "cstrahan"; - repo = "go-repo-root"; - rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; - sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; - }; - - buildInputs = [ tools ]; - - meta = with lib; { - homepage = "https://github.com/cstrahan/go-repo-root"; - maintainers = with maintainers; [ cstrahan ]; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index e58627857171..529e18417c79 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, perl, icmake, utillinux }: +{ stdenv, fetchFromGitHub, perl, icmake, utillinux }: -stdenv.mkDerivation rec { +let version = "3.05.01"; in +stdenv.mkDerivation { name = "yodl-${version}"; - version = "3.05.01"; buildInputs = [ perl icmake ]; - src = fetchurl { - url = "mirror://sourceforge/yodl/yodl_${version}.orig.tar.gz"; - sha256 = "0ghdzr3lzgfzvfymnjbj4mw8vpq098swvipxghhqgfmv58dhwgas"; + src = fetchFromGitHub { + sha256 = "02vbayvnz5p0055456i8kc8qxywkhn7agfrx1kwxaalbsnrd4g9h"; + rev = version; + repo = "yodl"; + owner = "fbb-git"; }; + sourceRoot = "yodl-${version}-src/yodl"; + preConfigure = '' - patchShebangs scripts/. - substituteInPlace INSTALL.im --replace /usr $out patchShebangs ./build + patchShebangs scripts/ + substituteInPlace INSTALL.im --replace /usr $out substituteInPlace macros/rawmacros/startdoc.pl --replace /usr/bin/perl ${perl}/bin/perl substituteInPlace scripts/yodl2whatever.in --replace getopt ${utillinux}/bin/getopt ''; @@ -33,9 +37,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A package that implements a pre-document language and tools to process it"; - homepage = http://yodl.sourceforge.net/; + homepage = https://fbb-git.github.io/yodl/; license = licenses.gpl3; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ nckx pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix new file mode 100644 index 000000000000..0ad3ece24651 --- /dev/null +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, buildEnv, makeWrapper +, xlibs, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap +, libnotify}: +let + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; + + nwEnv = buildEnv { + name = "nwjs-env"; + paths = [ + xlibs.libX11 xlibs.libXrender glib gtk atk pango cairo gdk_pixbuf + freetype fontconfig xlibs.libXcomposite alsaLib xlibs.libXdamage + xlibs.libXext xlibs.libXfixes nss nspr gconf expat dbus stdenv.cc + xlibs.libXtst xlibs.libXi xlibs.libXcursor xlibs.libXrandr libcap + libnotify + ]; + }; + +in stdenv.mkDerivation rec { + name = "nwjs-${version}"; + version = "0.12.3"; + + src = fetchurl { + url = "http://dl.nwjs.io/v${version}/nwjs-v${version}-linux-${bits}.tar.gz"; + sha256 = if bits == "x64" then + "1i5ipn5x188cx54pbbmjj1bz89vvcfx5z1c7pqy2xzglkyb2xsyg" else + "117gx6yjbcya64yg2vybcfyp591sid209pg8a33k9afbsmgz684c"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/nwjs + cp -R * $out/share/nwjs + + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc + + ln -s ${udev}/lib/libudev.so $out/share/nwjs/libudev.so.0 + + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw + patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc + + mkdir -p $out/bin + ln -s $out/share/nwjs/nw $out/bin + ln -s $out/share/nwjs/nwjc $out/bin + ''; + + buildInputs = [ makeWrapper ]; + + meta = with stdenv.lib; { + description = "An app runtime based on Chromium and node.js"; + homepage = http://nwjs.io/; + platforms = ["i686-linux" "x86_64-linux"]; + maintainers = [ maintainers.offline ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 0b9c4fcbc644..3cfd86f477e6 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -1,29 +1,32 @@ -{ stdenv, fetchurl, bobcat, icmake, yodl }: +{ stdenv, fetchFromGitHub, bobcat, icmake, yodl }: -let version = "2.02.00"; in +let version = "2.03.00"; in stdenv.mkDerivation { name = "flexc++-${version}"; - src = fetchurl { - sha256 = "0mz5d0axr4c8rrmn4iw7b5llmf6f3g9cnjzzz3kw02mfzwll79rz"; - url = "mirror://sourceforge/flexcpp/${version}/flexc++_${version}.orig.tar.gz"; + src = fetchFromGitHub { + sha256 = "1knb5h6l71n5zi9xzml5f6v7wspbk7vrcaiy2div8bnj7na3z717"; + rev = version; + repo = "flexcpp"; + owner = "fbb-git"; }; meta = with stdenv.lib; { inherit version; - description = ""; + description = "C++ tool for generating lexical scanners"; longDescription = '' Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design and requires simpler specification files than offered by flex's C++ option. ''; - homepage = http://flexcpp.sourceforge.net/; - downloadPage = http://sourceforge.net/projects/flexcpp/files/; + homepage = https://fbb-git.github.io/flexcpp/; license = licenses.gpl3; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; + sourceRoot = "flexcpp-${version}-src/flexc++"; + buildInputs = [ bobcat ]; nativeBuildInputs = [ icmake yodl ]; diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix new file mode 100644 index 000000000000..1e735611782a --- /dev/null +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchgit, rustUnstable, makeWrapper }: + +with rustUnstable; + +buildRustPackage rec { + name = "rustfmt-git-2015-09-05"; + src = fetchgit { + url = https://github.com/nrc/rustfmt; + rev = "6c5d3500bb805b37865fe961a7054f8435d176fc"; + sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90"; + }; + + depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8"; + + meta = with stdenv.lib; { + description = "A tool for formatting Rust code according to style guidelines"; + homepage = https://github.com/nrc/rustfmt; + license = with licenses; [ mit asl20 ]; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index d60724846698..6a0c8ca512e8 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "3.0.0"; + version = "3.1.0"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; src = fetchurl { url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf"; + sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727"; }; prePatch = '' diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix index 6dc7b68c71c2..22cc5001c920 100644 --- a/pkgs/development/web/wml/default.nix +++ b/pkgs/development/web/wml/default.nix @@ -20,30 +20,40 @@ perlPackages.buildPerlPackage rec { sed -i '/p2_mp4h\/doc/d' Makefile.in ''; - buildInputs = [ perlPackages.perl ncurses lynx makeWrapper ]; + buildInputs = with perlPackages; + [ perl TermReadKey GD BitVector ncurses lynx makeWrapper ImageSize ]; patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ]; - preFixup = '' - substituteInPlace $out/bin/wml \ + postPatch = '' + substituteInPlace wml_frontend/wml.src \ --replace "File::PathConvert::realpath" "Cwd::realpath" \ --replace "File::PathConvert::abs2rel" "File::Spec->abs2rel" \ --replace "File::PathConvert" "File::Spec" + for i in wml_include/des/imgbg.src wml_include/des/imgdot.src; do + substituteInPlace $i \ + --replace "WML::GD" "GD" + done + + rm wml_test/t/11-wmk.t + ''; + + preFixup = '' wrapProgram $out/bin/wml \ --set PERL5LIB ${with perlPackages; stdenv.lib.makePerlPath [ BitVector TermReadKey ImageSize ]} ''; - enableParallelBuilding = true; + enableParallelBuilding = false; + + installTargets = "install"; meta = with stdenv.lib; { homepage = http://thewml.org/; description = "Off-line HTML generation toolkit for Unix"; license = licenses.gpl2; platforms = platforms.linux; - # Not sure what broke this build, it used to work - broken = true; }; } diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix new file mode 100644 index 000000000000..24f71a5c6a16 --- /dev/null +++ b/pkgs/games/airstrike/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, makeWrapper, SDL, SDL_image }: + +stdenv.mkDerivation rec { + name = "airstrike-pre-${version}"; + version = "6a"; + + src = fetchurl { + url = "http://icculus.org/airstrike/airstrike-pre${version}-src.tar.gz"; + sha256 = "1h6rv2zcp84ycmd0kv1pbpqjgwx57dw42x7878d2c2vnpi5jn8qi"; + }; + + buildInputs = [ makeWrapper SDL SDL_image ]; + + installPhase = '' + ls -l + mkdir -p $out/bin + cp airstrike $out/bin + + mkdir -p $out/share + cp -r data airstrikerc $out/share + + wrapProgram $out/bin/airstrike \ + --run "cd $out/share" + ''; + + meta = with stdenv.lib; { + description = "A 2d dogfighting game"; + homepage = https://icculus.org/airstrike/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index ed134bcf3c92..061f7c328d68 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; }; - patches = [ ./header-order.patch ]; + patches = [ ./header-order.patch ./public-buildproject.patch ]; postPatch = '' cp campaigns/tutorial-part4.map{,.orig} diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/games/globulation/public-buildproject.patch new file mode 100644 index 000000000000..1eaedf08820d --- /dev/null +++ b/pkgs/games/globulation/public-buildproject.patch @@ -0,0 +1,21 @@ +diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h +--- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400 ++++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400 +@@ -148,7 +148,7 @@ + TOP_TO_BOTTOM, + BOTTOM_TO_TOP + }; +- ++public: + struct BuildProject + { + int posX; +@@ -158,7 +158,7 @@ + int unitWorking; + int unitWorkingFuture; + }; +- ++private: + ///Initiates Game + void init(GameGUI *gui, MapEdit* edit); + diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch new file mode 100644 index 000000000000..1de99542bdbf --- /dev/null +++ b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch @@ -0,0 +1,36 @@ +From 21eb5b79072b147d0a9b7fafca98501e7056c834 Mon Sep 17 00:00:00 2001 +From: koda <vittorio.giovara@gmail.com> +Date: Tue, 2 Jun 2015 19:51:04 +0100 +Subject: [PATCH] Fix building hedgewars-server + +--- + gameServer/CoreTypes.hs | 2 +- + gameServer/hedgewars-server.cabal | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs +index 553e722..2c75153 100644 +--- a/gameServer/CoreTypes.hs ++++ b/gameServer/CoreTypes.hs +@@ -38,7 +38,7 @@ import RoomsAndClients + instance NFData B.ByteString + #endif + +-instance NFData (Chan a) ++instance NFData (Chan a) where rnf a = () + + instance NFData Action where + rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` () +diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal +index 122f2ef..f36a190 100644 +--- a/gameServer/hedgewars-server.cabal ++++ b/gameServer/hedgewars-server.cabal +@@ -33,7 +33,7 @@ Executable hedgewars-server + utf8-string, + SHA, + entropy, +- zlib ++ zlib >= 0.5.3 && < 0.6 + + if !os(windows) + build-depends: unix diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index bb776a7a10d0..b92a14d84c28 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,27 +1,27 @@ { SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer -, zlib, libpng, mesa +, zlib, libpng, mesa, physfs }: let ghc = ghcWithPackages (pkgs: with pkgs; [ - network vector utf8-string bytestring-show random hslogger dataenc + network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2 ]); in stdenv.mkDerivation rec { - version = "0.9.20.5"; + version = "0.9.21"; name = "hedgewars-${version}"; src = fetchurl { url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2"; - sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56"; + sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w"; }; buildInputs = [ SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc - qt4 ghc ffmpeg freeglut makeWrapper + qt4 ghc ffmpeg freeglut makeWrapper physfs ]; - patches = [ ./fix-ghc-7.8-build-failure.diff ]; + patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ]; preBuild = '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib + wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib:${physfs}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix new file mode 100644 index 000000000000..4ef3e533772d --- /dev/null +++ b/pkgs/games/lgogdownloader/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, curl, boost, jsoncpp, liboauth, rhash, tinyxml, htmlcxx, help2man }: + +stdenv.mkDerivation rec { + name = "lgogdownloader-${version}"; + version = "2.24"; + + src = fetchgit { + url = "https://github.com/Sude-/lgogdownloader.git"; + rev = "refs/tags/v${version}"; + sha256 = "1h5l4zc22hj4all2w0vfby1rmhpca33g3bhdnqw11w2ligk8j14r"; + }; + + buildInputs = [ curl boost jsoncpp liboauth rhash tinyxml htmlcxx help2man ]; + + buildPhase = '' + make release + ''; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = { + homepage = https://github.com/Sude-/lgogdownloader; + description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader."; + license = stdenv.lib.licenses.wtfpl; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index cf55bcd597e2..3a32e12101c1 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, mesa, openal, autoconf, automake, libtool, freealut, wxGTK, -freetype, fftwSinglePrec, SDL, SDL_net, zlib, libpng, libjpeg, pkgconfig, libogg, -libvorbis} : +{ stdenv, fetchurl, mesa, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +, freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: -stdenv.mkDerivation { - name = "scorched3d-43.2a"; +stdenv.mkDerivation rec { + version = "44"; + name = "scorched3d-${version}"; src = fetchurl { - url = mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz; - sha256 = "1hv1mnfb7y51hqmg95l8rx00j66ff32ddxxi5zgfyw92hsvahgxi"; + url = "mirror://sourceforge/scorched3d/Scorched3D-${version}-src.tar.gz"; + sha256 = "1fldi9pn7cz6hc9h70pacgb7sbykzcac44yp3pkhn0qh4axj10qw"; }; buildInputs = - [ mesa openal freealut wxGTK freetype fftwSinglePrec SDL_net zlib libpng libjpeg - libogg libvorbis ]; + [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis + SDL SDL_net expat libjpeg libpng + ]; nativeBuildInputs = [ pkgconfig ]; @@ -19,20 +20,15 @@ stdenv.mkDerivation { sourceRoot = "scorched"; - configureFlags = "--with-fftw=${fftwSinglePrec}"; + configureFlags = [ "--with-fftw=${fftwSinglePrec}" ]; -# Fake openal-config - preConfigure = - '' - mkdir -pv mybin - export PATH=$PATH:$PWD/mybin - echo -e "#!/bin/sh\npkg-config openal \"$@\"" > mybin/openal-config - chmod +x mybin/openal-config - ''; + NIX_LDFLAGS = [ "-lopenal" ]; - meta = { + meta = with stdenv.lib; { homepage = http://scorched3d.co.uk/; description = "3D Clone of the classic Scorched Earth"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + platforms = platforms.linux; # maybe more + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 83b2c62870e5..4260ded0d6ff 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -1,23 +1,26 @@ -{stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf} : +{stdenv, fetchurl, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_net, python } : stdenv.mkDerivation rec { - name = "tennix-1.0"; + name = "tennix-1.1"; src = fetchurl { url = "http://icculus.org/tennix/downloads/${name}.tar.gz"; - sha256 = "18rd7h1j5skpkh037misixw9gigzc7qy13vrnrs21rphcfxzpifn"; + sha256 = "0np5kw1y7i0z0dsqx4r2nvmq86qj8hv3mmgavm3hxraqnds5z8cm"; }; + buildInputs = [ python SDL SDL_mixer SDL_image SDL_ttf SDL_net ]; + + patches = [ ./fix_FTBFS.patch ]; preConfigure = '' - makeFlags="PREFIX=$out USE_PYTHON=0" + makeFlags="PREFIX=$out" installFlags="PREFIX=$out install" ''; - buildInputs = [ SDL SDL_mixer SDL_image SDL_ttf ]; - - meta = { + meta = with stdenv.lib; { homepage = http://icculus.org/tennix/; - description = "Tennix 2009 World Tennis Championship Tour"; - license = stdenv.lib.licenses.gpl2Plus; + description = "Classic Championship Tour 2011"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/games/tennix/fix_FTBFS.patch b/pkgs/games/tennix/fix_FTBFS.patch new file mode 100644 index 000000000000..9079fbb07679 --- /dev/null +++ b/pkgs/games/tennix/fix_FTBFS.patch @@ -0,0 +1,288 @@ +From: Thomas Perl <m@thp.io> +Description: Fix FTBFS +Origin: upstream, http://repo.or.cz/w/tennix.git/commitdiff/6144cb7626dfdc0820a0036af83a531e8e68bae6 +Bug-Debian: http://bugs.debian.org/664907 + +--- tennix-1.1.orig/archivetool.cc ++++ tennix-1.1/archivetool.cc +@@ -24,6 +24,7 @@ + #include <assert.h> + #include <stdio.h> + #include <stdlib.h> ++#include <libgen.h> + #include <sys/stat.h> + + #include "archive.hh" +--- tennix-1.1.orig/game.c ++++ tennix-1.1/game.c +@@ -388,6 +388,9 @@ void step(GameState* s) { + s->ball.move_x = 4.0 + 3.0*PLAYER(s, p).power/PLAYER_POWER_MAX; + s->ball.move_z = 1.1*PLAYER(s, p).power/PLAYER_POWER_MAX; + break; ++ default: ++ assert(false); ++ break; + } + s->ball.move_y = get_move_y( s, p); + s->sound_events ^= SOUND_EVENT_RACKET; +--- tennix-1.1.orig/network.h ++++ tennix-1.1/network.h +@@ -103,19 +103,19 @@ void + net_serialize_ball(const Ball* src, NetworkBall* dest); + + void +-net_unserialize_ball(const NetworkBall* src, Ball* dest); ++net_unserialize_ball(NetworkBall* src, Ball* dest); + + void + net_serialize_player(const Player* src, NetworkPlayer* dest); + + void +-net_unserialize_player(const NetworkPlayer* src, Player* dest); ++net_unserialize_player(NetworkPlayer* src, Player* dest); + + void + net_serialize_gamestate(const GameState* src, NetworkGameState* dest); + + void +-net_unserialize_gamestate(const NetworkGameState* src, GameState* dest); ++net_unserialize_gamestate(NetworkGameState* src, GameState* dest); + + #endif + +--- tennix-1.1.orig/locations.h ++++ tennix-1.1/locations.h +@@ -155,7 +155,7 @@ static Location locations[] = { + #endif + + /* End marker */ +- { NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, false } ++ { NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, false, false, 0, 0 } + }; + + unsigned int location_count() +--- tennix-1.1.orig/tennix.cc ++++ tennix-1.1/tennix.cc +@@ -461,7 +461,7 @@ int main( int argc, char** argv) { + start_fade(); + gameloop(current_game, connection); + SDL_Delay(150); +- while(SDL_PollEvent(&e)); ++ while (SDL_PollEvent(&e)) {}; + #ifdef ENABLE_FPS_LIMIT + frames = 0; + ft = SDL_GetTicks(); +--- tennix-1.1.orig/SDL_rotozoom.c ++++ tennix-1.1/SDL_rotozoom.c +@@ -365,6 +365,9 @@ int zoomSurfaceRGBA(SDL_Surface * src, S + + int zoomSurfaceY(SDL_Surface * src, SDL_Surface * dst, int flipx, int flipy) + { ++ (void)flipx; ++ (void)flipy; ++ + Uint32 x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy; + Uint8 *sp, *dp, *csp; + int dgap; +@@ -393,7 +396,7 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ + */ + csx = 0; + csax = sax; +- for (x = 0; x < dst->w; x++) { ++ for (x = 0; x < (Uint32)dst->w; x++) { + csx += sx; + *csax = (csx >> 16); + csx &= 0xffff; +@@ -401,7 +404,7 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ + } + csy = 0; + csay = say; +- for (y = 0; y < dst->h; y++) { ++ for (y = 0; y < (Uint32)dst->h; y++) { + csy += sy; + *csay = (csy >> 16); + csy &= 0xffff; +@@ -410,13 +413,13 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ + + csx = 0; + csax = sax; +- for (x = 0; x < dst->w; x++) { ++ for (x = 0; x < (Uint32)dst->w; x++) { + csx += (*csax); + csax++; + } + csy = 0; + csay = say; +- for (y = 0; y < dst->h; y++) { ++ for (y = 0; y < (Uint32)dst->h; y++) { + csy += (*csay); + csay++; + } +@@ -432,10 +435,10 @@ int zoomSurfaceY(SDL_Surface * src, SDL_ + * Draw + */ + csay = say; +- for (y = 0; y < dst->h; y++) { ++ for (y = 0; y < (Uint32)dst->h; y++) { + csax = sax; + sp = csp; +- for (x = 0; x < dst->w; x++) { ++ for (x = 0; x < (Uint32)dst->w; x++) { + /* + * Draw + */ +@@ -801,6 +804,8 @@ SDL_Surface* rotateSurface90Degrees(SDL_ + void rotozoomSurfaceSizeTrig(int width, int height, double angle, double zoomx, double zoomy, int *dstwidth, int *dstheight, + double *canglezoom, double *sanglezoom) + { ++ (void)zoomy; ++ + double x, y, cx, cy, sx, sy; + double radangle; + int dstwidthhalf, dstheighthalf; +--- tennix-1.1.orig/network.c ++++ tennix-1.1/network.c +@@ -183,7 +183,7 @@ net_serialize_ball(const Ball* src, Netw + } + + void +-net_unserialize_ball(const NetworkBall* src, Ball* dest) ++net_unserialize_ball(NetworkBall* src, Ball* dest) + { + assert(src != NULL && dest != NULL); + dest->x = unpack_float(SDLNet_Read32(&(src->x)), -WIDTH, WIDTH*2); +@@ -213,7 +213,7 @@ net_serialize_player(const Player* src, + } + + void +-net_unserialize_player(const NetworkPlayer* src, Player* dest) ++net_unserialize_player(NetworkPlayer* src, Player* dest) + { + assert(src != NULL && dest != NULL); + dest->x = unpack_float(SDLNet_Read32(&(src->x)), 0, WIDTH*1.2); +@@ -221,7 +221,7 @@ net_unserialize_player(const NetworkPlay + dest->power = unpack_float(SDLNet_Read32(&(src->power)), 0, 110); + dest->use_power = src->use_power; + dest->score = src->score; +- dest->desire = src->desire; ++ dest->desire = (PlayerDesire)src->desire; + dest->game = src->game; + memcpy(dest->sets, src->sets, sizeof(unsigned char)*(SETS_TO_WIN*2)); + dest->accelerate = unpack_float(SDLNet_Read32(&(src->accelerate)), 0, 200); +@@ -250,7 +250,7 @@ net_serialize_gamestate(const GameState* + } + + void +-net_unserialize_gamestate(const NetworkGameState* src, GameState* dest) ++net_unserialize_gamestate(NetworkGameState* src, GameState* dest) + { + int p; + +--- tennix-1.1.orig/makefile ++++ tennix-1.1/makefile +@@ -27,24 +27,23 @@ ifeq ($(MKCALLGRAPH),1) + LD = nccld + endif + +-RELEASE = 1.1 +- +-UNAME = $(shell uname) ++RELEASE = 1.1.1 + + PREFIX ?= /usr/local + BINDIR ?= $(PREFIX)/bin + DATAROOTDIR ?= $(PREFIX)/share + DATADIR ?= $(DATAROOTDIR)/games + +-LIBS = +-CFLAGS += -W -Wall -ansi -pedantic -Wcast-qual -Wwrite-strings -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" -g ++CFLAGS += -W -Wall -DVERSION=\"$(RELEASE)\" -O2 -DPREFIX=\"$(PREFIX)\" + CXXFLAGS += $(CFLAGS) + + USE_PYTHON ?= 1 + + ifeq ($(USE_PYTHON),1) +- CFLAGS += `python-config --includes` -DTENNIX_PYTHON +- LIBS += `python-config --libs` ++ PYTHON_INCLUDES := $(shell python-config --includes) ++ PYTHON_LIBS := $(shell python-config --libs) ++ CFLAGS += $(PYTHON_INCLUDES) -DTENNIX_PYTHON ++ LIBS += $(PYTHON_LIBS) + endif + + ifeq ($(NONFREE_LOCATIONS),1) +@@ -67,17 +66,14 @@ ifeq ($(MAEMO),1) + CFLAGS += -DMAEMO + endif + +-ifeq ($(UNAME),Darwin) +- SDLLIBS=$$(sdl-config --prefix)/lib +- LIBS += $$(sdl-config --static-libs) $(SDLLIBS)/libSDL_mixer.a $(SDLLIBS)/libSDL_image.a $(SDLLIBS)/libSDL_ttf.a $(SDLLIBS)/libSDL_net.a $$(freetype-config --prefix)/lib/libfreetype.a +- CFLAGS += $$(sdl-config --cflags) -lz +-else +- LIBS += $$(sdl-config --libs) -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net +- CFLAGS += $$(sdl-config --cflags) +-endif ++SDL_LIBS := $(shell sdl-config --libs) ++SDL_CFLAGS := $(shell sdl-config --cflags) ++ ++LIBS += $(SDL_LIBS) -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net ++CFLAGS += $(SDL_CFLAGS) + +-SRC = tennix.cc game.c graphics.cc input.c util.c sound.cc animation.c network.c + OBJ = tennix.o game.o graphics.o input.o util.o sound.o animation.o archive.o SDL_rotozoom.o network.o ++ + ifeq ($(MSYSTEM),MINGW32) + OBJ += tennixres.o + endif +--- tennix-1.1.orig/game.h ++++ tennix-1.1/game.h +@@ -98,6 +98,13 @@ typedef struct { + bool inhibit_gravity; + } Ball; + ++enum PlayerDesire { ++ DESIRE_NORMAL, ++ DESIRE_TOPSPIN, ++ DESIRE_SMASH, ++ DESIRE_MAX ++}; ++ + typedef struct { + InputDevice* input; + char input_device_index; +@@ -106,9 +113,9 @@ typedef struct { + float power; + bool use_power; + unsigned char score; +- unsigned char desire; ++ PlayerDesire desire; + bool type; /* is this player ai-controlled or human? */ +- char game; /* score for the current game */ ++ int game; /* score for the current game */ + unsigned char sets[SETS_TO_WIN*2]; /* score for each set */ + float accelerate; /* a value [0..1] how fast the user accelerates */ + } Player; +@@ -118,13 +125,6 @@ enum { + PLAYER_TYPE_AI + }; + +-enum { +- DESIRE_NORMAL, +- DESIRE_TOPSPIN, +- DESIRE_SMASH, +- DESIRE_MAX +-}; +- + /* wait 2 seconds before we score the game */ + #define SCORING_DELAY 1000 + +@@ -161,7 +161,7 @@ enum { + + typedef struct { + const Location* location; +- char current_location; /* index of loc. in global location table */ ++ int current_location; /* index of loc. in global location table */ + Ball ball; + Player players[MAXPLAYERS]; + unsigned char serving_player; diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index bcd3f3a453a7..31220b4aa627 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -1,21 +1,23 @@ { stdenv, fetchurl, cmake, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango , gettext, zlib, boost, freetype, libpng, pkgconfig, lua, dbus, fontconfig, libtool -, fribidi, asciidoc }: +, fribidi, asciidoc, libpthreadstubs, libXdmcp, libxshmfence, libvorbis }: stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.10.7"; + version = "1.12.4"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2"; - sha256 = "0gi5fzij48hmhhqxc370jxvxig5q3d70jiz56rjn8yx514s5lfwa"; + sha256 = "19qyylylaljhk45lk2ja0xp7cx9iy4hx07l65zkg20a2v9h50lmz"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext zlib - boost fribidi cmake freetype libpng pkgconfig lua - dbus fontconfig libtool ]; + boost fribidi freetype libpng lua libpthreadstubs libXdmcp + dbus fontconfig libtool libxshmfence libvorbis ]; cmakeFlags = [ "-DENABLE_STRICT_COMPILATION=FALSE" ]; # newer gcc problems http://gna.org/bugs/?21030 diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix new file mode 100644 index 000000000000..fdbfd0f16753 --- /dev/null +++ b/pkgs/games/xpilot/default.nix @@ -0,0 +1,23 @@ +{stdenv, fetchurl, libX11, SDL, mesa, expat, SDL_ttf, SDL_image}: +let + buildInputs = [ + libX11 SDL SDL_ttf SDL_image mesa expat + ]; +in +stdenv.mkDerivation rec { + version = "4.7.3"; + name = "xpilot-ng-${version}"; + inherit buildInputs; + src = fetchurl { + url = "mirror://sourceforge/xpilot/xpilot_ng/${name}/${name}.tar.gz"; + sha256 = "02a7pnp88kh88fzda5q8mzlckk6y9r5fw47j00h26wbsfly0k1zj"; + }; + meta = { + inherit version; + description = ''A multiplayer X11 space combat game''; + homepage = "http://xpilot.sf.net/"; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 5032ef245a6e..dea00c35b4e0 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -3,7 +3,7 @@ , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null }: -let version = "2.0.3"; in +let version = "2.0.4"; in with stdenv.lib; stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "10c84ppc9prx6gcyskmm6fh0rks346yryzd356gkg9whhq26fcdw"; + sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ] diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 461d3c11c3c4..ea32287da744 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; + broken = true; }; } diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 825968c61631..ba26c44305bd 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mednafen-${version}"; - version = "0.9.38.5"; + version = "0.9.38.6"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/mednafen/Mednafen/${version}/${name}.tar.bz2"; - sha256 = "1s1qwwlhkxr0vhzvlc1m0ib9lj7cws3cldm2mbjz4b421nxfdi8h"; + url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2"; + sha256 = "0ivy0vqy1cjd5namn4bdm9ambay6rdccjl9x5418mjyqdhydlq4l"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index eb80937b6a35..25fd1a5cbbf7 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { name = "${prefix}jack2-${version}"; - version = "2015-06-02"; + version = "1.9.10"; src = fetchFromGitHub { owner = "jackaudio"; repo = "jack2"; - rev = "b5bceb50c708f55cc569c3e1f0f1876a49fbdade"; - sha256 = "0dc00729wkbxnbhnmyfam1wdwd5m8jvrjccypb32bj072jqaqaw7"; + rev = "v${version}"; + sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr"; }; nativeBuildInputs = [ pkgconfig python makeWrapper ]; @@ -41,10 +41,12 @@ stdenv.mkDerivation rec { optDbus optPythonDBus optLibffado optAlsaLib optLibopus ]; - patchPhase = '' + prePatch = '' substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash ''; + patches = [ ./jack-gcc5.patch ]; + configurePhase = '' python waf configure --prefix=$out \ ${optionalString (optDbus != null) "--dbus"} \ diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch new file mode 100644 index 000000000000..f18042c6e32c --- /dev/null +++ b/pkgs/misc/jackaudio/jack-gcc5.patch @@ -0,0 +1,26 @@ +From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001 +From: Adrian Knoth <adi@drcomp.erfurt.thur.de> +Date: Thu, 18 Sep 2014 18:29:23 +0200 +Subject: [PATCH] Fix FTBFS with clang++ + +Forwarded from http://bugs.debian.org/757820 +--- + common/memops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/memops.c b/common/memops.c +index 27f6194..2d416b6 100644 +--- a/common/memops.c ++++ b/common/memops.c +@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s) + */ + static unsigned int seed = 22222; + +-inline unsigned int fast_rand() { ++static inline unsigned int fast_rand() { + seed = (seed * 96314165) + 907633515; + return seed; + } +-- +2.4.0 + diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index f635e0f149bb..cef143e309a4 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, pam ? null, x11 }: +{ stdenv, lib, fetchurl, pam ? null, autoreconfHook +, libX11, libXext, libXinerama, libXdmcp, libXt }: stdenv.mkDerivation rec { @@ -9,37 +10,26 @@ stdenv.mkDerivation rec { }; # Optionally, it can use GTK+. - buildInputs = [ pam x11 ]; + buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; + + nativeBuildInputs = [ autoreconfHook ]; # Don't try to install `xlock' setuid. Password authentication works # fine via PAM without super user privileges. configureFlags = - " --with-crypt" - + " --enable-appdefaultdir=$out/share/X11/app-defaults" - + " --disable-setuid" - + " --without-editres" - + " --without-xpm" - + " --without-gltt" - + " --without-ttf" - + " --without-ftgl" - + " --without-freetype" - + " --without-opengl" - + " --without-mesa" - + " --without-dtsaver" - + " --without-ext" - + " --without-dpms" - + " --without-xinerama" - + " --without-rplay" - + " --without-nas" - + " --without-gtk2" - + " --without-gtk" - + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); + [ "--disable-setuid" + ] ++ (lib.optional (pam != null) "--enable-pam"); - preConfigure = '' - configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" - ''; + postPatch = + let makePath = p: lib.concatMapStringsSep " " (x: x + "/" + p) buildInputs; + inputs = "${makePath "lib"} ${makePath "include"}"; + in '' + sed -i 's,\(for ac_dir in\),\1 ${inputs},' configure.ac + sed -i 's,/usr/,/no-such-dir/,g' configure.ac + configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults" + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen locker for the X Window System"; homepage = http://www.tux.org/~bagleyd/xlockmore.html; license = licenses.gpl2; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 675a6839c863..4fe6ae4c6e22 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -22,11 +22,11 @@ in stdenv.mkDerivation rec { name = "uboot-${defconfig}-${version}"; - version = "2015.04"; + version = "2015.07"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0q2x1wh1f6rjh9rmcnkf28dxcvp9hkhi4vzspqkzamb6b3gp06ha"; + sha256 = "1nclmyii5a1igvgjc4kxvi1fk2y82hp2iy4iywp34b3zf6ywjj0b"; }; patches = [ ./vexpress-Use-config_distro_bootcmd.patch ]; diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch index 9c61847f02ee..ce057b6aa657 100644 --- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch +++ b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch @@ -1,4 +1,4 @@ -From 53a8612ff19f360363edaaf70137968f7fd6a1cd Mon Sep 17 00:00:00 2001 +From 1fb764e1866513a69b4a0c29b69f8e78ea1df7fa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> Date: Mon, 8 Jun 2015 22:29:23 +0300 Subject: [PATCH] vexpress: Use config_distro_bootcmd @@ -7,9 +7,10 @@ Also had to hack cli_readline.c, as one codepath in cli_readline_into_buffer doesn't respect the timeout. --- common/cli_readline.c | 12 +++++++++++- + configs/vexpress_ca9x4_defconfig | 2 -- include/configs/vexpress_ca9x4.h | 1 - - include/configs/vexpress_common.h | 35 +++++++++++++++++++++++------------ - 3 files changed, 34 insertions(+), 14 deletions(-) + include/configs/vexpress_common.h | 34 ++++++++++++++++++++++------------ + 4 files changed, 33 insertions(+), 16 deletions(-) diff --git a/common/cli_readline.c b/common/cli_readline.c index 9a9fb35..ca997a9 100644 @@ -41,6 +42,22 @@ index 9a9fb35..ca997a9 100644 #ifdef CONFIG_SHOW_ACTIVITY while (!tstc()) { +diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig +index 2947fc1..9a5123d 100644 +--- a/configs/vexpress_ca9x4_defconfig ++++ b/configs/vexpress_ca9x4_defconfig +@@ -5,11 +5,9 @@ CONFIG_TARGET_VEXPRESS_CA9X4=y + # CONFIG_CMD_IMLS is not set + # CONFIG_CMD_XIMG is not set + # CONFIG_CMD_EDITENV is not set +-# CONFIG_CMD_ENV_EXISTS is not set + # CONFIG_CMD_LOADB is not set + # CONFIG_CMD_LOADS is not set + # CONFIG_CMD_FPGA is not set +-# CONFIG_CMD_ECHO is not set + # CONFIG_CMD_ITEST is not set + # CONFIG_CMD_SETEXPR is not set + # CONFIG_CMD_NFS is not set diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 38ac4ed..993398c 100644 --- a/include/configs/vexpress_ca9x4.h @@ -53,7 +70,7 @@ index 38ac4ed..993398c 100644 #endif /* VEXPRESS_CA9X4_H */ diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h -index db78c85..1dd069b 100644 +index 0c1da01..72850d0 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -123,7 +123,6 @@ @@ -64,16 +81,15 @@ index db78c85..1dd069b 100644 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024) -@@ -152,6 +151,8 @@ +@@ -152,6 +151,7 @@ #define CONFIG_SYS_SERIAL0 V2M_UART0 #define CONFIG_SYS_SERIAL1 V2M_UART1 +#include <config_distro_defaults.h> -+#include <config_cmd_default.h> /* Command line configuration */ - #define CONFIG_CMD_BDI #define CONFIG_CMD_DHCP -@@ -169,7 +170,6 @@ + #define CONFIG_CMD_PXE +@@ -163,7 +163,6 @@ #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_CMD_FAT @@ -81,7 +97,7 @@ index db78c85..1dd069b 100644 #define CONFIG_MMC 1 #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC -@@ -207,17 +207,28 @@ +@@ -201,17 +200,28 @@ GENERATED_GBL_DATA_SIZE) #define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_GBL_DATA_OFFSET @@ -118,7 +134,7 @@ index db78c85..1dd069b 100644 #elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP) #define CONFIG_PLATFORM_ENV_SETTINGS \ "loadaddr=0xa0008000\0" \ -@@ -240,7 +251,8 @@ +@@ -234,7 +244,8 @@ "devtmpfs.mount=0 vmalloc=256M\0" \ "bootflash=run flashargs; " \ "cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \ @@ -128,14 +144,14 @@ index db78c85..1dd069b 100644 /* FLASH and environment organization */ #define PHYS_FLASH_SIZE 0x04000000 /* 64MB */ -@@ -294,7 +306,6 @@ +@@ -287,7 +298,6 @@ + #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ - #define CONFIG_CMD_SOURCE #define CONFIG_SYS_LONGHELP -#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_SYS_MAXARGS 16 /* max command args */ #endif /* VEXPRESS_COMMON_H */ -- -2.4.4 +2.4.5 diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 23f8b0e16e3d..4210ba69485f 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -46,6 +46,7 @@ rec { colors-solarized = Solarized; colorsamplerpack = Colour_Sampler_Pack; command_T = command-t; # backwards compat, added 2014-10-18 + css_color_5056 = vim-css-color; easy-align = vim-easy-align; easymotion = vim-easymotion; eighties = vim-eighties; @@ -84,35 +85,34 @@ rec { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing; - - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2015-06-22"; + CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "CSApprox-2013-07-26"; src = fetchgit { - url = "git://github.com/chrisbra/CheckAttach"; - rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; - sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f"; + url = "git://github.com/godlygeek/csapprox"; + rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; + sha256 = "8ccb47eb79c7ab63109d32158388812bdca340985527af4f2a5489ff8683389f"; }; dependencies = []; }; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CSApprox-2013-07-26"; + CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "CheckAttach-2015-06-22"; src = fetchgit { - url = "git://github.com/godlygeek/csapprox"; - rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; - sha256 = "8ccb47eb79c7ab63109d32158388812bdca340985527af4f2a5489ff8683389f"; + url = "git://github.com/chrisbra/CheckAttach"; + rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; + sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f"; }; dependencies = []; }; Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-07-04"; + name = "Gist-2015-08-13"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "52e2d54a038baf548de01c9413a6ebc8860fa111"; - sha256 = "32b9c0ccc51b846651ac49d496060b842a57ca342bdc1038b16c59c1b34b0ca0"; + rev = "ea7dc962c5c2ac2a1c4adc94d54cac190d713648"; + sha256 = "0b96a572018de25120fe91eea17b8ee2844881c88ab63e03d999c22fc292f11e"; }; dependencies = []; @@ -152,22 +152,22 @@ rec { }; Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2015-02-15"; + name = "Supertab-2015-08-28"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; - sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b"; + rev = "9f7da6d4988daf863ebc414f221bb12c2614f59e"; + sha256 = "18c74fde13eced99e492c7747a7924d1b2c33bfb99a87a6d7c44f1c8ca9e9225"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-07-29"; + name = "Syntastic-2015-08-27"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "a01107ffa66fdd38d3ea0fcc769f3582349c5a3f"; - sha256 = "66b2ef4ad41f30ed409c77e05e637b9c122e62a4acda98d2f89c9205227eba64"; + rev = "3c2e7e4ce37bc68b54f23c62efd0be291e6dc450"; + sha256 = "a293ae35c1960f9f4149bae5c2c676b5db4b9b1ae0f6ef70a91bca8a55e01986"; }; dependencies = []; @@ -207,22 +207,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-07-13"; + name = "The_NERD_tree-2015-07-30"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "86e2e40af161e65a3ad671214f16f23af360a5a7"; - sha256 = "de4f35757f6e14644e59a7ba3e5d0a10ffe04aea9d192f2f81bba24d14c7595c"; + rev = "bcf3de4fdffae45fc7c85b6b84a01b37177924aa"; + sha256 = "969c3d81f85674303fb295c55da6be3339ffa8658ed98cb20f92eb21551da847"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-07-27"; + name = "UltiSnips-2015-08-21"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "67fbdb2ad8c965378bdd60c892d3a43049caf3f1"; - sha256 = "487fd113adc9a2c66ae6c12cbbd21e283e1a9c024a65910398ecf26322772c07"; + rev = "e48d8a28e55e931a3340dae937aa7f66954815ad"; + sha256 = "8859aeebd30fc48e481ec11ba7f38c2d91ceae979fbc2045969b077e2b0cf124"; }; dependencies = []; @@ -277,6 +277,17 @@ rec { }; + vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-css-color-2015-06-22"; + src = fetchgit { + url = "git://github.com/ap/vim-css-color"; + rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; + sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd"; + }; + dependencies = []; + + }; + ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ctrlp-2013-07-29"; src = fetchgit { @@ -288,6 +299,28 @@ rec { }; + ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-py-matcher-2015-07-18"; + src = fetchgit { + url = "git://github.com/FelikZ/ctrlp-py-matcher"; + rev = "9e84cf8072866b92faf5082cb93a554b75e35fd0"; + sha256 = "7d4d5f7da148ddc9c8956aca87f53d9d0ff458b8fb4bc4ab2a9bff2ee6026cde"; + }; + dependencies = []; + + }; + + ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-z-2013-05-08"; + src = fetchgit { + url = "git://github.com/amiorin/ctrlp-z"; + rev = "7845735a3d63a68ed63aa3a5363b178c48f199bf"; + sha256 = "14c5240e6ab373cbd04d105a46808aed4a324472ddfd67b993534bf5d726e93f"; + }; + dependencies = []; + + }; + extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-01-26"; src = fetchgit { @@ -300,33 +333,33 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-07-20"; + name = "fugitive-2015-08-02"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "03cc95cc198ea94a6a003a92cd0e58af4416ec25"; - sha256 = "cab17591d0eeb0fff4520855347467d85baf56b444dd60b797323d164e92a9de"; + rev = "b319b694539017dcd789dc2c42f784a30d7b28b8"; + sha256 = "88e0ac84a016969cf6231ae3705b931d3ee7d0902417c50d7c1397d80b1534b4"; }; dependencies = []; }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-07-26"; + name = "ghcmod-2015-08-05"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "caf086cd84fe0b26f24f0f93233d4c0c98bce524"; - sha256 = "04fa2558baab2b9d93c49f3d984f0ed8196513875095ab7117f39b02087bfeeb"; + rev = "ff8fe7d64d0db35be9a753e2c2a289760ab02dd5"; + sha256 = "db5a932e4604bed9d4a7d6ff06367f9cae93a87424fc79d2fade7c15061ab563"; }; dependencies = []; }; vim-addon-vim2nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-vim2nix-2015-06-16"; + name = "vim-addon-vim2nix-2015-09-01"; src = fetchgit { url = "git://github.com/JagaJaga/vim-addon-vim2nix"; - rev = "046702653f7af5829a3f3fda3b7cf89c2a8d03b5"; - sha256 = "b92068c32ce14e75159070acbd86c52e09aaa65a523fd566e44762ed33403161"; + rev = "ce9ddf99983c00adbd41e0d53ad8cead9712069c"; + sha256 = "c4b3b4832684bebbf890741b30b1364ca7240b5348cd0c0ee93d6ba477e8f77d"; }; dependencies = ["vim-addon-manager"]; @@ -366,11 +399,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-07-05"; + name = "neco-ghc-2015-08-28"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "2ad708360c8f64732a0827618cddfd23e89a8664"; - sha256 = "ff18dcb7e5b076f88acc51dd508729635a76c619e592db010af6e877ff7afa92"; + rev = "21ba0eba8f9a9787b69c21c45dd286f927220d71"; + sha256 = "62c17fafd98dd1e6357c5c459a38cec2cb622eaad69ab2e8eb5caf2ea593f37b"; }; dependencies = []; @@ -387,12 +420,23 @@ rec { }; + vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-go-2015-08-12"; + src = fetchgit { + url = "git://github.com/fatih/vim-go"; + rev = "5048bdbebcffb296aa60b4c21c44ae8276244539"; + sha256 = "b2a6dc12a7029a1e19f81fb1ddf009d62847e0958b6b083f6aa39445db3739cd"; + }; + dependencies = []; + + }; + idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2015-07-19"; + name = "idris-vim-2015-08-14"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "91b695a9120268a9b9828a0665e89b3c39a1f070"; - sha256 = "df16f45fd6c79f44c7da179c6cfc06e1d43aa801832249b12d8134c476db7ff9"; + rev = "45680a3c412f2cc8d40aff512e5e9ace44002922"; + sha256 = "e053a37cb14228a49be265c5fa1af96d3bae1a5a5ceffdd21e3c4547a79656b1"; }; dependencies = []; @@ -443,22 +487,22 @@ rec { }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2015-07-12"; + name = "vim-buffergator-2015-08-15"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "28f818ea0aea6771c153efb91a35fc0ab9a16700"; - sha256 = "d19710b41d24b2e5611e5c2977dc7fac47f3d9899b80c44da2f5d08b3538551a"; + rev = "ed3bfc2b560f687075d9c2225079bfe43f1f2390"; + sha256 = "f2024ecf447e5cca2d66efdb6d31e2890e7210e142728873ab521b8c5ea17c11"; }; dependencies = []; }; tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2015-02-10"; + name = "tslime-vim-2015-08-14"; src = fetchgit { url = "git://github.com/jgdavey/tslime.vim"; - rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7"; - sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b"; + rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd"; + sha256 = "e63113f80c056484c462f6d1eb4634cbe4c6c29170f76f4c992adc17b3539a25"; }; dependencies = []; @@ -475,17 +519,6 @@ rec { }; - vim-golang = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-golang-2014-08-06"; - src = fetchgit { - url = "git://github.com/jnwhiteh/vim-golang"; - rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c"; - sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af"; - }; - dependencies = []; - - }; - vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-xdebug-2012-08-15"; src = fetchgit { @@ -531,11 +564,11 @@ rec { }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2015-07-25"; + name = "vim-easymotion-2015-08-06"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "eab003a0991608464b58c90c56be5d9c6b64d840"; - sha256 = "6f5d4942481c41c1a88c45066ea51019ee4ecd4235e0f54c549cb7df2b8b59e6"; + rev = "0806257ca6432ac7beb75c4319dadf7f3ba9907b"; + sha256 = "529f836da3a546c507ec99f7c827902a75472fefe570a93258360bfa4c253909"; }; dependencies = []; @@ -590,11 +623,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-07-29"; + name = "racer-2015-08-30"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "25150ce32e5936b38933d66324830fedb95a8c7c"; - sha256 = "40a3d9c22f50f69e45e8f551a655c2ca327fd07b8872059f2938983387e07707"; + rev = "dcebb106b65a083d70d7d87bd7bdf42a72179d96"; + sha256 = "8efec086c394f574cddf09f7b2dfab5062de897f67110e1097a567e2fecf06b1"; }; dependencies = []; buildPhase = '' @@ -604,60 +637,74 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2015-07-25"; + name = "neocomplete-vim-2015-08-22"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "aaa1f08b06bfcc2a329dba12a37ce8e1578636bd"; - sha256 = "56c2dc4431858432763bcf134ebbc74272d6f3cdd2db5f9a8b21f2e4a8b028c8"; + rev = "39661033cce39ebd013451b49809e94ade3ba08c"; + sha256 = "7a1482f44ff7a1fb27273d12023da25028c9fa393e6cbfcf9c417fecdb09f0b2"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2015-07-27"; + name = "neosnippet-snippets-2015-08-21"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "a34e67d4b3f91bf2320cd7ce1e85bbd300c6095e"; - sha256 = "773170fddb95bc5df1b26abc52e29338f3d5515a5afd99719aa23d9569c5389d"; + rev = "f72814aee4f8530b0f22ca9fa814e1e6473ba543"; + sha256 = "934177c1c51e3a386f21b678fceaa46a6ea63c7570ab71afa25f35fe30119777"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2015-07-23"; + name = "neosnippet-vim-2015-09-01"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "e619d43571a675057461f29f2c039dab64728f32"; - sha256 = "8682bba6039962c01ffa0f9946a1f2a8e8a37ffda2d32862d72c5ee3d87241c5"; + rev = "1617094a8c9df36d9a505f533b3a2efa44039412"; + sha256 = "a061f5943b077219990288e369c6013a730117f2168f08f50d09b0d5032319a9"; + }; + dependencies = []; + + }; + + unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "unite-vim-2015-08-30"; + src = fetchgit { + url = "git://github.com/shougo/unite.vim"; + rev = "f1aa053aae95e0185c5c9667ecd938c4fc37c2c7"; + sha256 = "f1cc089cf82d77df73950f8beefe7caa84f77b9ae995be0aa83a3ebd38a5044e"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-07-22"; + name = "vimproc-vim-2015-08-29"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "0555aecded8737435747e903efc4b6f3241cc62c"; - sha256 = "0a9445214c6733d21d56ebe278f2e0bc1027b08eb7763df95b8d0ebd34850a60"; + rev = "a6bd6893749e3cbfb07230f4284c36b2dc2d8179"; + sha256 = "11473597d678ac45628a8625025cba75945ebce9e5d7eecf20b17901ffb3bf46"; }; dependencies = []; buildInputs = [ which ]; buildPhase = '' - sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim + substituteInPlace autoload/vimproc.vim \ + --replace vimproc_mac.so vimproc_unix.so \ + --replace vimproc_linux64.so vimproc_unix.so \ + --replace vimproc_linux32.so vimproc_unix.so make -f make_unix.mak ''; }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2015-07-25"; + name = "vimshell-vim-2015-08-28"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "adb2a0d95e9b0009d152c35c930eb04875562d87"; - sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723"; + rev = "a1f9a2010bea4b109341f1e2411a32839a8547b3"; + sha256 = "bd2419b50b981e62e25afaa9c5206b818098cd7663cac8566f1d654fbea56ca6"; }; dependencies = [ "vimproc-vim" ]; }; @@ -674,11 +721,22 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2015-07-27"; + name = "vim-quickrun-2015-08-09"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "c22f2f50614a68d8f60ae334cc4545dbc57051a9"; - sha256 = "fef4f13c3d1946040cb4e4ceba6a89759fc77c1f72f2f7f038df644620a41398"; + rev = "ec9f7f2c26dd49ffaf4f3ce8c6254c76696fbf41"; + sha256 = "dc80ac9ee04329e770a549f83a6b167629daf29f513f31af0c076c237e978b5a"; + }; + dependencies = []; + + }; + + molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "molokai-2014-04-11"; + src = fetchgit { + url = "git://github.com/tomasr/molokai"; + rev = "db8ce13b3737d3ddea8368498183d7c204a762eb"; + sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a"; }; dependencies = []; @@ -707,11 +765,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-07-08"; + name = "youcompleteme-2015-08-31"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "b9dd9096a34c1d720878f0058dc3e68f9e9c87ea"; - sha256 = "88a3ff421300f53756359ec8e6c901fe96de492091587cf9a5e40b299698f077"; + rev = "f94b342989deb1a20b5f87ef2a7d30b16a9ff733"; + sha256 = "0a4d7e30a3ecdb22cb8ffa9bafae8b3bdb160c92ab5e2ce57413f2177e28eedc"; }; dependencies = []; buildInputs = [ @@ -733,7 +791,7 @@ rec { cd $target/build cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang + ${python}/bin/python $target/third_party/ycmd/build.py --clang-completer --system-libclang ${vimHelpTags} vimHelpTags $target @@ -830,11 +888,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2015-07-03"; + name = "vim-wakatime-2015-08-28"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "28044b7b5f5be812fd34c757632d1d814578ec9b"; - sha256 = "74fa0eac0a546c7012b4a6fe5f6cd66eaa2ed40887bc61d468be148dcd538692"; + rev = "02277aca9907c955e51156ad9685aae75a5da70d"; + sha256 = "7f6b5b99e47d0cd09d6a9649b7150db70008766ceafea59dc80ba74770ee4507"; }; dependencies = []; buildInputs = [ python ]; @@ -857,6 +915,17 @@ rec { ''; }; + goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "goyo-2015-08-08"; + src = fetchgit { + url = "git://github.com/junegunn/goyo.vim"; + rev = "c1293a91a3a04bcb82421b2ee711c49f83a418ae"; + sha256 = "258b23f4f043569e6e0458c8035d5b00be6031b02e460136f7783da1bbadcc49"; + }; + dependencies = []; + + }; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "matchit-zip"; src = fetchurl { @@ -968,11 +1037,11 @@ rec { }; surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2015-03-15"; + name = "surround-2015-08-07"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a"; - sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef"; + rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c"; + sha256 = "e5372cbb384e747181e3dfe4a53f042da18bd0d6af7a01184850ecb084ddb350"; }; dependencies = []; @@ -1011,22 +1080,22 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2015-05-20"; + name = "tlib-2015-08-05"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7"; - sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971"; + rev = "4c128ee2fee6d97cc5c6089e7797b4ad536de2a4"; + sha256 = "9cd0fc23bb332d5ae939019929d989b636b891c894f350c38234eaf084e0656c"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2015-03-01"; + name = "undotree-2015-08-19"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277"; - sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7"; + rev = "8ff701a5bdb8d382431eb042e4faf3320883b020"; + sha256 = "9c166cb812be486350a3e71eed273a630545d91e3198a214e3dce13b131aeb1d"; }; dependencies = []; @@ -1286,11 +1355,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-07-28"; + name = "vim-gitgutter-2015-08-26"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "fe10e6474d70c382edcda84dc6bcd6fcd575a6c5"; - sha256 = "0266775153760c86e51a83106813936c661717a1c72d4103215739aff9ad1b76"; + rev = "1067294cdc379be1deb56074a093b49a8303308f"; + sha256 = "cb9f44e41fbf565eb07968270289bb4988a84f30f03d11f2919c0423c5ee278c"; }; dependencies = []; @@ -1319,11 +1388,11 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2015-05-29"; + name = "vim-multiple-cursors-2015-08-27"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96"; - sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186"; + rev = "146fe47ee6b2faf90d6dc1232ef1858883d798bb"; + sha256 = "916659142dc0abb3a390b56b6ec3c69e489cbbab582e09af8b9aae5b9a792727"; }; dependencies = []; @@ -1340,12 +1409,34 @@ rec { }; + vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signify-2015-08-13"; + src = fetchgit { + url = "git://github.com/mhinz/vim-signify"; + rev = "d08f17873e3187da3f9998ddb81d81626ffb9ecf"; + sha256 = "7fffc5fbd21dd4f3ea81131ccb52d992d95a73be72288457b2ec3a0fa53ce3b2"; + }; + dependencies = []; + + }; + vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-07-29"; + name = "vim-snippets-2015-08-31"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "814896e4d29f2b796d076935d7d079c64c351f4f"; - sha256 = "173d2f52c0715dd78692b5f1d3368920ed976a05a87887b056526abfd530ffa3"; + rev = "ec99c8c24f541727a648f072a84b9d1ea28f2341"; + sha256 = "5b1cdefc54959db41458898ebeefeb7d4396fbb9e7e2a5d256c4fd47931e5f07"; + }; + dependencies = []; + + }; + + vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-webdevicons-2015-08-28"; + src = fetchgit { + url = "git://github.com/ryanoasis/vim-devicons"; + rev = "2bc50727340bd43fca65d1baa09c36dda71fff6c"; + sha256 = "3dea4be46ff7e2408d62c0f9a3f5c9fab0fe893e0f343bc4ebb25e1f30801f26"; }; dependencies = []; @@ -1374,13 +1465,14 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2015-03-21"; + name = "vundle-2015-08-10"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933"; - sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50"; + rev = "0ee36b26e127cda512a8f2852a59e5a5f374c87f"; + sha256 = "62fc2b756bd2a8bc9452c61de5babbb1f02de6e8122424a60862be61b8f80af1"; }; dependencies = []; }; + } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7d3fa3433754..8498053f58cd 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,5 +1,6 @@ -"CheckAttach" +"vim-webdevicons" "CSApprox" +"CheckAttach" "Gist" "Gundo" "Hoogle" @@ -16,15 +17,19 @@ "YankRing" "commentary" "ctrlp" +"ctrlp-py-matcher" +"ctrlp-z" "extradite" "fugitive" "ghcmod" "github:JagaJaga/vim-addon-vim2nix" +"github:ap/vim-css-color" "github:bitc/lushtags" "github:bitc/vim-hdevtools" "github:christoomey/vim-tmux-navigator" "github:eagletmt/neco-ghc" "github:esneider/YUNOcommit.vim" +"github:fatih/vim-go" "github:idris-hackers/idris-vim" "github:itchyny/calendar.vim" "github:itchyny/thumbnail.vim" @@ -33,7 +38,6 @@ "github:jeetsukumaran/vim-buffergator" "github:jgdavey/tslime.vim" "github:jistr/vim-nerdtree-tabs" -"github:jnwhiteh/vim-golang" "github:joonty/vim-xdebug" "github:justincampbell/vim-eighties" "github:latex-box-team/latex-box" @@ -47,10 +51,12 @@ "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" "github:shougo/neosnippet.vim" +"github:shougo/unite.vim" "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:takac/vim-hardtime" "github:thinca/vim-quickrun" +"github:tomasr/molokai" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" @@ -63,13 +69,15 @@ "github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"goyo" "matchit.zip" "pathogen" "quickfixstatus" "rainbow_parentheses" "rust" -"sleuth" "sensible" +"sensible" +"sleuth" "snipmate" "sourcemap" "surround" @@ -99,6 +107,7 @@ "vim-latex-live-preview" "vim-multiple-cursors" "vim-signature" +"vim-signify" "vim-snippets" "vim2hs" "vimwiki" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index ec1724a9f9a1..c75a92f46cfb 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -1,6 +1,7 @@ -{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}: +{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin +, nix-prefetch-scripts }: -/* +/* USAGE EXAMPLE ============= @@ -309,8 +310,8 @@ rec { echom repeat("=", 80) endif let opts = {} - let opts.nix_prefetch_git = "${../../../pkgs/build-support/fetchgit/nix-prefetch-git}" - let opts.nix_prefetch_hg = "${../../../pkgs/build-support/fetchhg/nix-prefetch-hg}" + let opts.nix_prefetch_git = "${nix-prefetch-scripts}/bin/nix-prefetch-git" + let opts.nix_prefetch_hg = "${nix-prefetch-scripts}/bin/nix-prefetch-hg" let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' let opts.plugin_dictionaries = [] ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index c54d4aa6319b..60bfe0930171 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig +{ stdenv, fetchFromGitHub, pkgconfig, cmake # dependencies , glib @@ -7,23 +7,17 @@ , mpdSupport ? true , ibmSupport ? true # IBM/Lenovo notebooks -# This should be optional, but it is not due to a bug in conky -# Please, try to make it optional again on update -, ncurses -#, ncursesSupport ? true , ncurses ? null - # optional features with extra dependencies +, ncursesSupport ? true , ncurses ? null , x11Support ? true , x11 ? null , xdamageSupport ? x11Support, libXdamage ? null , imlib2Support ? x11Support, imlib2 ? null -, luaSupport ? true , lua ? null +, luaSupport ? true , lua ? null , luaImlib2Support ? luaSupport && imlib2Support , luaCairoSupport ? luaSupport && x11Support, cairo ? null , toluapp ? null -, alsaSupport ? true , alsaLib ? null - , wirelessSupport ? true , wirelesstools ? null , curlSupport ? true , curl ? null @@ -33,7 +27,7 @@ , libxml2 ? null }: -#assert ncursesSupport -> ncurses != null; +assert ncursesSupport -> ncurses != null; assert x11Support -> x11 != null; assert xdamageSupport -> x11Support && libXdamage != null; @@ -46,8 +40,6 @@ assert luaCairoSupport -> luaSupport && toluapp != null assert luaCairoSupport || luaImlib2Support -> lua.luaversion == "5.1"; -assert alsaSupport -> alsaLib != null; - assert wirelessSupport -> wirelesstools != null; assert curlSupport -> curl != null; @@ -58,62 +50,52 @@ assert weatherXoapSupport -> curlSupport && libxml2 != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "conky-1.9.0"; - - src = fetchurl { - url = "mirror://sourceforge/conky/${name}.tar.bz2"; - sha256 = "0vxvjmi3cdvnp994sv5zcdyncfn0mlxa71p2wm9zpyrmy58bbwds"; + name = "conky-${version}"; + version = "1.10.0"; + + src = fetchFromGitHub { + owner = "brndnmtthws"; + repo = "conky"; + rev = "v${version}"; + sha256 = "00vyrf72l54j3majqmn6vykqvvb15vygsaby644nsb5vpma6b1cn"; }; NIX_LDFLAGS = "-lgcc_s"; - buildInputs = [ pkgconfig glib ] - ++ [ ncurses ] - #++ optional ncursesSupport ncurses + buildInputs = [ pkgconfig glib cmake ] + ++ optional ncursesSupport ncurses ++ optional x11Support x11 ++ optional xdamageSupport libXdamage ++ optional imlib2Support imlib2 ++ optional luaSupport lua ++ optionals luaImlib2Support [ toluapp imlib2 ] ++ optionals luaCairoSupport [ toluapp cairo ] - - ++ optional alsaSupport alsaLib - ++ optional wirelessSupport wirelesstools - ++ optional curlSupport curl ++ optional rssSupport libxml2 ++ optional weatherXoapSupport libxml2 ; - configureFlags = - let flag = state: flags: if state then map (x: "--enable-${x}") flags - else map (x: "--disable-${x}") flags; - in flag mpdSupport [ "mpd" ] - ++ flag ibmSupport [ "ibm" ] - - #++ flag ncursesSupport [ "ncurses" ] - ++ flag x11Support [ "x11" "xft" "argb" "double-buffer" "own-window" ] # conky won't compile without --enable-own-window - ++ flag xdamageSupport [ "xdamage" ] - ++ flag imlib2Support [ "imlib2" ] - ++ flag luaSupport [ "lua" ] - ++ flag luaImlib2Support [ "lua-imlib2" ] - ++ flag luaCairoSupport [ "lua-cairo" ] - - ++ flag alsaSupport [ "alsa" ] - - ++ flag wirelessSupport [ "wlan" ] - - ++ flag curlSupport [ "curl" ] - ++ flag rssSupport [ "rss" ] - ++ flag weatherMetarSupport [ "weather-metar" ] - ++ flag weatherXoapSupport [ "weather-xoap" ] - ; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + ++ optional curlSupport "-DBUILD_CURL=ON" + ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" + ++ optional imlib2Support "-DBUILD_IMLIB2=ON" + ++ optional luaCairoSupport "-DBUILD_LUA_CAIRO=ON" + ++ optional luaImlib2Support "-DBUILD_LUA_IMLIB2=ON" + ++ optional (!mpdSupport) "-DBUILD_MPD=OFF" + ++ optional (!ncursesSupport) "-DBUILD_NCURSES=OFF" + ++ optional rssSupport "-DBUILD_RSS=ON" + ++ optional (!x11Support) "-DBUILD_X11=OFF" + ++ optional xdamageSupport "-DBUILD_XDAMAGE=ON" + ++ optional weatherMetarSupport "-DBUILD_WEATHER_METAR=ON" + ++ optional weatherXoapSupport "-DBUILD_WEATHER_XOAP=ON" + ++ optional wirelessSupport "-DBUILD_WLAN=ON" + ; - meta = { + meta = with stdenv.lib; { homepage = http://conky.sourceforge.net/; description = "Advanced, highly configurable system monitor based on torsmo"; - maintainers = [ stdenv.lib.maintainers.guibert ]; - license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ maintainers.guibert ]; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index a995b193a845..9c4e0f3990c2 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "firmware-linux-nonfree-${version}"; - version = "2015-07-23"; + version = "2015-09-07"; # This repo is built by merging the latest versions of # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wkennington"; repo = "linux-firmware"; - rev = "854b7f33e839ceea41034b45d6f755ea70c85486"; - sha256 = "1hhqvb96adk64ljf6hp5qss8fhpic28y985gbggh5p2w9bsgs5zq"; + rev = "0c3ac7434235f57967df4046ceafc0e4a08bb139"; + sha256 = "1jhcgf0anjfi2998nzplr9l1q0b1yi306a2w1k2r4civsmfgm08r"; }; preInstall = '' diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix index 34d0f3881e42..683ec9f6155d 100644 --- a/pkgs/os-specific/linux/freefall/default.nix +++ b/pkgs/os-specific/linux/freefall/default.nix @@ -1,39 +1,33 @@ { stdenv, fetchurl }: -let version = "3.19"; in +let version = "4.2"; in stdenv.mkDerivation { name = "freefall-${version}"; src = fetchurl { - sha256 = "0v40b5l6dcviqgl47bxlcbimz7kawmy1c2909axi441jwlgm2hmy"; - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; }; - buildPhase = '' - cd Documentation/laptops + postPatch = '' + cd tools/laptop/freefall # Default time-out is a little low, probably because the AC/lid status # functions were never implemented. Because no-one still uses HDDs, right? - substituteInPlace freefall.c --replace "alarm(2)" "alarm(5)" - - cc -o freefall freefall.c + substituteInPlace freefall.c --replace "alarm(2)" "alarm(7)" ''; - installPhase = '' - mkdir -p $out/bin - install freefall $out/bin - ''; + makeFlags = "PREFIX=$(out)"; meta = with stdenv.lib; { description = "Free-fall protection for spinning HP/Dell laptop hard drives"; longDescription = '' - ATA/ATAPI-7 specifies the IDLE IMMEDIATE command with unload feature. - Issuing this command should cause the drive to switch to idle mode and - unload disk heads. This feature is being used in modern laptops in - conjunction with accelerometers and appropriate software to implement - a shock protection facility. The idea is to stop all I/O operations on - the internal hard drive and park its heads on the ramp when critical - situations are anticipated. This has no effect on SSD devices! + Provides a shock protection facility in modern laptops with spinning hard + drives, by stopping all input/output operations on the internal hard drive + and parking its heads on the ramp when critical situations are anticipated. + Requires support for the ATA/ATAPI-7 IDLE IMMEDIATE command with unload + feature, which should cause the drive to switch to idle mode and unload the + disk heads, and an accelerometer device. It has no effect on SSD devices! ''; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix index 873795c9752b..8f3250f85f7f 100644 --- a/pkgs/os-specific/linux/htop/default.nix +++ b/pkgs/os-specific/linux/htop/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; nativeBuildInputs = [ autoreconfHook ]; + postPatch = '' + touch *.h # unnecessary regeneration requires Python + ''; + meta = { description = "An interactive process viewer for Linux"; homepage = "http://htop.sourceforge.net"; diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index b76ce583b23c..2db57ecef92a 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "ipset-6.24"; + name = "ipset-6.26"; src = fetchurl { url = "http://ipset.netfilter.org/${name}.tar.bz2"; - sha256 = "1l4mx78473azf7cb19fxf37gmj95k1zzabimbcmlg9h07wlgqw9h"; + sha256 = "0lbsg1fbiw9m959lgqziyivmx32z3vbnp3jhgnprkq31ia7a29kn"; }; - buildInputs = [ pkgconfig libmnl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libmnl ]; configureFlags = [ "--with-kmod=no" ]; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 386004dad43a..7b8a18613650 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -477,8 +477,7 @@ with stdenv.lib; ${optionalString (versionAtLeast version "3.17") "NFC? n"} - # Enable firmware loading via udev. Only needed for non-declarative - # firmware in /root/test-firmware. + # Enable firmware loading via udev (legacy). ${optionalString (versionAtLeast version "3.17") '' FW_LOADER_USER_HELPER_FALLBACK y ''} diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 904aebd75be5..8146f4a5decb 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.46"; + version = "3.12.47"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "01w0b1sifzivbagm724bz0mlfrm7hpbj5a3lx1yrv8xg64gni3m1"; + sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 05c4b989f394..02052b5d2ae3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.20"; + version = "3.18.21"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1mwm9xgilsqnj95v3jn94dz9a108ggfm4ifb3kxsfsx5rcl5yy8d"; + sha256 = "0y54kh55grgbyw4k8fa9vx8b426bq9lz12bpvwvzfjs7vimachyw"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix index eee052ad3bb9..fc44c6f1dbb8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.9"; - extraMeta.branch = "4.0"; + version = "4.2"; + modDirVersion = "4.2.0"; + extraMeta.branch = "4.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0k42blafzd954fncc0b78vi9x1h2k0jhfvkjqxmpv64i7xwwdhsx"; + sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index efd3515ff240..2dcdcdc4a91d 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -23,10 +23,13 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ]; - buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++ + buildInputs = [ python perl newt slang pkgconfig libunwind binutils ] ++ stdenv.lib.optional withGtk gtk; - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # Note: we don't add elfutils to buildInputs, since it provides a + # bad `ld' and other stuff. + NIX_CFLAGS_COMPILE = "-I${elfutils}/include -Wno-error=cpp"; + NIX_CFLAGS_LINK = "-L${elfutils}/lib"; installFlags = "install install-man ASCIIDOC8=1"; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 5fe065d3cc66..128838c9c5cc 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchFromGitHub, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - version = "2.6.0-5-g1b2a542"; + version = "2.6.2-1-g7a88f8b"; - src = fetchgit { - url = "https://github.com/lttng/lttng-modules.git"; - rev = "1b2a5429de815c95643df2eadf91253909708728"; - sha256 = "0zccaiadnk0xl6xrqaqlg9rpkwjgbq2fiyc3psylzqimnx0ydxc2"; + src = fetchFromGitHub { + owner = "lttng"; + repo = "lttng-modules"; + rev = "7a88f8b50696dd71e80c08661159caf8e119bf51"; + sha256 = "1i185dvk4wn7fmmx1zfv6g15x8wi38jmav2dmq0mmy8cvriajq8h"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index db7017edd439..abe96e9b9ae6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.10"; + version = "1.1.11"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0z4b3j1r0v4zr3v1cpl1v56zx6w8nq1y3wbs8x1zg87pqyqykfs5"; + sha256 = "0grmmah3d9wajii26010plpinv3cbiq3kfqsblgn84kv3fjnv7mv"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh index 07cc1a85de0b..d0eec0f7403b 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh @@ -107,6 +107,9 @@ installPhase() { #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* + + # we distribute these separately in `libvdpau` + rm "$out"/lib/libvdpau{.*,_trace.*} } diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 1198208c9da8..ba65089a4f73 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -122,6 +122,9 @@ installPhase() { # For simplicity and dependency reduction, don't support the gtk3 interface. rm $out/lib/libnvidia-gtk3.* + + # we distribute these separately in `libvdpau` + rm "$out"/lib/libvdpau{.*,_trace.*} } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index cbd9a19777e5..953c8c601253 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "352.30"; + versionNumber = "352.41"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; @@ -28,15 +28,17 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "1qrjvf41zk50hw7gjiwg9jxwgpaarlwm019py4wfqgjgb1cbhgjn"; + sha256 = "1qzn6dhkrpkx015f7y9adafn7fmz7zbxbczzf9930li8pgvmmz5k"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "1h7ghmykhdyy3n853s8yjzc0qbh50qb2kc0khz672b1rna4wqyhg"; + sha256 = "1k9hmmn5x9snzyggx23km64kjdqjh2kva090ha6mlayyyxrclz56"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; + patches = [ ./nvidia-4.2.patch ]; + inherit versionNumber libsOnly; inherit (stdenv) system; diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch new file mode 100644 index 000000000000..412b786179ae --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-4.2.patch @@ -0,0 +1,26 @@ +diff --git a/kernel/nv-frontend.c b/kernel/nv-frontend.c +index 65bbb1b..be39c8d 100644 +--- a/kernel/nv-frontend.c ++++ b/kernel/nv-frontend.c +@@ -15,7 +15,7 @@ + #include "nv-frontend.h" + + #if defined(MODULE_LICENSE) +-MODULE_LICENSE("NVIDIA"); ++MODULE_LICENSE("GPL\0NVIDIA"); + #endif + #if defined(MODULE_INFO) + MODULE_INFO(supported, "external"); +diff --git a/kernel/nv.c b/kernel/nv.c +index abe81ed..05945b5 100644 +--- a/kernel/nv.c ++++ b/kernel/nv.c +@@ -31,7 +31,7 @@ + + #if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0) + #if defined(MODULE_LICENSE) +-MODULE_LICENSE("NVIDIA"); ++MODULE_LICENSE("GPL\0NVIDIA"); + #endif + #if defined(MODULE_INFO) + MODULE_INFO(supported, "external"); diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 13d144c54b09..fe517a710219 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "1.0.5"; + version = "1.1.1"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "0vwhmnwai24h654d1zchm5qkbr030ay98l2qdp914ydgwhw9k6pn"; + sha256 = "0gldvyr96jgbcahq7rl3k4krzyhvlz95ckiqh3yhink56s5z58cy"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 4c47047ff74f..dd5a2741267b 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -2,20 +2,41 @@ assert stdenv.isLinux; # Don't bother with older versions, though some would probably work: -assert stdenv.lib.versionAtLeast kernel.version "4.0"; +assert stdenv.lib.versionAtLeast kernel.version "4.2"; # Disable on grsecurity kernels, which break module building: assert !kernel.features ? grsecurity; -let version = "0.4.0-rev17"; in -stdenv.mkDerivation { +let + release = "0.4.0"; + revbump = "rev18"; # don't forget to change forum download id... + version = "${release}-${revbump}"; +in stdenv.mkDerivation { name = "linux-phc-intel-${version}-${kernel.version}"; src = fetchurl { - sha256 = "1fdfpghnsa5s98lisd2sn0vplrq0n54l0pkyyzkyb77z4fa6bs4p"; - url = "http://www.linux-phc.org/forum/download/file.php?id=166"; - name = "phc-intel-pack-rev17.tar.bz2"; + sha256 = "1480y75yid4nw7dhzm97yb10dykinzjz34abvavsrqpq7qclhv27"; + url = "http://www.linux-phc.org/forum/download/file.php?id=167"; + name = "phc-intel-pack-${revbump}.tar.bz2"; }; + buildInputs = [ which ]; + + makeFlags = with kernel; [ + "DESTDIR=$(out)" + "KERNELSRC=${dev}/lib/modules/${modDirVersion}/build" + ]; + + configurePhase = '' + make $makeFlags brave + ''; + + enableParallelBuilding = false; + + installPhase = '' + install -m 755 -d $out/lib/modules/${kernel.version}/extra/ + install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ + ''; + meta = with stdenv.lib; { inherit version; description = "Undervolting kernel driver for Intel processors"; @@ -28,22 +49,7 @@ stdenv.mkDerivation { homepage = http://www.linux-phc.org/; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; - - buildInputs = [ which ]; - - makeFlags = "KERNELSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build DESTDIR=$(out)"; - - configurePhase = '' - echo make $makeFlags brave - ''; - - enableParallelBuilding = false; - - installPhase = '' - install -m 755 -d $out/lib/modules/${kernel.version}/extra/ - install -m 644 *.ko $out/lib/modules/${kernel.version}/extra/ - ''; } diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 4eb8394a4d34..1933523d9c2d 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "0y9l9k60iy21hj0lcvfdfxs1fxydg6d3pxp9rhy7hwr4y5vgh6dq"; }; + patches = [ ./fix-printf-type.patch ]; + postPatch = '' # Fix references to libsepol.a find . -name Makefile -exec sed -i 's,[^ ]*/libsepol.a,${libsepol}/lib/libsepol.a,g' {} \; diff --git a/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch new file mode 100644 index 000000000000..6ab2d6dccc73 --- /dev/null +++ b/pkgs/os-specific/linux/policycoreutils/fix-printf-type.patch @@ -0,0 +1,12 @@ +diff -Nru policycoreutils-2.4/setfiles/restore.c policycoreutils-2.4.new/setfiles/restore.c +--- policycoreutils-2.4/setfiles/restore.c 2015-02-02 09:38:10.000000000 -0500 ++++ policycoreutils-2.4.new/setfiles/restore.c 2015-08-29 20:44:13.693023222 -0400 +@@ -118,7 +118,7 @@ + r_opts->count++; + if (r_opts->count % STAR_COUNT == 0) { + if (r_opts->progress == 1) { +- fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT ); ++ fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT ); + } else { + if (r_opts->nfile > 0) { + progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index e5e579081f67..99f52dc5aed3 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.5"; + version = "0.6.2"; name = "reptyr-${version}"; src = fetchurl { url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz"; - sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm"; + sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7"; }; makeFlags = ["PREFIX=$(out)"]; meta = { diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix new file mode 100644 index 000000000000..a16e102bc088 --- /dev/null +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + name = "rtl8812au-${kernel.version}-${version}"; + version = "4.2.2-1"; + + src = fetchFromGitHub { + owner = "csssuf"; + repo = "rtl8812au"; + rev = "874906aec694c800bfc29b146737b88dae767832"; + sha256 = "14ifhplawipfd6971mxw76dv3ygwc0n8sbz2l3f0vvkin6x88bsj"; + }; + + patchPhase = '' + substituteInPlace ./Makefile --replace /lib/modules/ "${kernel.dev}/lib/modules/" + substituteInPlace ./Makefile --replace '$(shell uname -r)' "${kernel.modDirVersion}" + substituteInPlace ./Makefile --replace /sbin/depmod # + substituteInPlace ./Makefile --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + preInstall = '' + mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" + ''; + + meta = { + description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod."; + homepage = "https://github.com/csssuf/rtl8812au"; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} \ No newline at end of file diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix index 9faba199a5da..216ea1fbbcd8 100644 --- a/pkgs/os-specific/linux/spl/git.nix +++ b/pkgs/os-specific/linux/spl/git.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-07-21"; + version = "2015-08-25"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; - rev = "9eb361aaa537724c9a90ab6a9f33521bfd80bad9"; - sha256 = "18sv4mw85fbm8i1s8k4y5dc43l6ll2f6hgfrawvzgvwni5i4h7n8"; + rev = "ae89cf0f34de323c4a7c39bfd9b906acc2635a87"; + sha256 = "04i3c4qg5zccl1inr17vgkjrz9zr718m64pbrlw9rvc82fw5g199"; }; patches = [ ./const.patch ./install_prefix.patch ]; diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index c1c768dbacb9..89a40f93b890 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -220,7 +220,7 @@ index 25c4a0b..e1f2d6d 100644 flags |= SHOW_MASKED; else if (strneq ("equivalent", word, l)) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 70a5918..1926e52 100644 +index 70a5918..a5661e8 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -315,8 +315,7 @@ int main(int argc, char *argv[]) { @@ -272,11 +272,231 @@ index e487369..ff4e9c9 100644 - return r < 0 ? EXIT_FAILURE : r; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; } +diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c +index 7dd8878..70a9a13 100644 +--- a/src/journal-remote/journal-remote-parse.c ++++ b/src/journal-remote/journal-remote-parse.c +@@ -344,22 +344,25 @@ int process_data(RemoteSource *source) { + LLLLLLLL0011223344...\n + */ + sep = memchr(line, '=', n); +- if (sep) ++ if (sep) { + /* chomp newline */ + n--; +- else ++ ++ r = iovw_put(&source->iovw, line, n); ++ if (r < 0) ++ return r; ++ } else { + /* replace \n with = */ + line[n-1] = '='; +- log_trace("Received: %.*s", (int) n, line); + +- r = iovw_put(&source->iovw, line, n); +- if (r < 0) { +- log_error("Failed to put line in iovect"); +- return r; ++ source->field_len = n; ++ source->state = STATE_DATA_START; ++ ++ /* we cannot put the field in iovec until we have all data */ + } + +- if (!sep) +- source->state = STATE_DATA_START; ++ log_trace("Received: %.*s (%s)", (int) n, line, sep ? "text" : "binary"); ++ + return 0; /* continue */ + } + +@@ -382,6 +385,7 @@ int process_data(RemoteSource *source) { + + case STATE_DATA: { + void *data; ++ char *field; + + assert(source->data_size > 0); + +@@ -396,11 +400,12 @@ int process_data(RemoteSource *source) { + + assert(data); + +- r = iovw_put(&source->iovw, data, source->data_size); +- if (r < 0) { +- log_error("failed to put binary buffer in iovect"); ++ field = (char*) data - sizeof(uint64_t) - source->field_len; ++ memmove(field + sizeof(uint64_t), field, source->field_len); ++ ++ r = iovw_put(&source->iovw, field + sizeof(uint64_t), source->field_len + source->data_size); ++ if (r < 0) + return r; +- } + + source->state = STATE_DATA_FINISH; + +diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h +index 8499f4e..22db550 100644 +--- a/src/journal-remote/journal-remote-parse.h ++++ b/src/journal-remote/journal-remote-parse.h +@@ -42,7 +42,9 @@ typedef struct RemoteSource { + size_t offset; /* offset to the beginning of live data in the buffer */ + size_t scanned; /* number of bytes since the beginning of data without a newline */ + size_t filled; /* total number of bytes in the buffer */ +- size_t data_size; /* size of the binary data chunk being processed */ ++ ++ size_t field_len; /* used for binary fields: the field name length */ ++ size_t data_size; /* and the size of the binary data chunk being processed */ + + struct iovec_wrapper iovw; + +diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c +index 5ab1982..1f980ee 100644 +--- a/src/journal/journal-authenticate.c ++++ b/src/journal/journal-authenticate.c +@@ -229,7 +229,7 @@ int journal_file_maybe_append_tag(JournalFile *f, uint64_t realtime) { + return 0; + } + +-int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p) { ++int journal_file_hmac_put_object(JournalFile *f, ObjectType type, Object *o, uint64_t p) { + int r; + + assert(f); +@@ -246,7 +246,7 @@ int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p + if (r < 0) + return r; + } else { +- if (type >= 0 && o->object.type != type) ++ if (type > OBJECT_UNUSED && o->object.type != type) + return -EBADMSG; + } + +diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h +index 0aaf836..565fe84 100644 +--- a/src/journal/journal-authenticate.h ++++ b/src/journal/journal-authenticate.h +@@ -33,7 +33,7 @@ int journal_file_append_first_tag(JournalFile *f); + int journal_file_hmac_setup(JournalFile *f); + int journal_file_hmac_start(JournalFile *f); + int journal_file_hmac_put_header(JournalFile *f); +-int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p); ++int journal_file_hmac_put_object(JournalFile *f, ObjectType type, Object *o, uint64_t p); + + int journal_file_fss_load(JournalFile *f); + int journal_file_parse_verification_key(JournalFile *f, const char *key); +diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h +index e55fa19..ab089cb 100644 +--- a/src/journal/journal-def.h ++++ b/src/journal/journal-def.h +@@ -52,8 +52,8 @@ typedef struct HashItem HashItem; + typedef struct FSSHeader FSSHeader; + + /* Object types */ +-enum { +- OBJECT_UNUSED, ++typedef enum ObjectType { ++ OBJECT_UNUSED, /* also serves as "any type" or "additional context" */ + OBJECT_DATA, + OBJECT_FIELD, + OBJECT_ENTRY, +@@ -62,7 +62,7 @@ enum { + OBJECT_ENTRY_ARRAY, + OBJECT_TAG, + _OBJECT_TYPE_MAX +-}; ++} ObjectType; + + /* Object flags */ + enum { diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 8a2c0fc..9de3ddd 100644 +index 8a2c0fc..c55a4dc 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c -@@ -1657,7 +1657,7 @@ static int generic_array_bisect( +@@ -374,7 +374,13 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) + return 0; + } + +-static int journal_file_move_to(JournalFile *f, int context, bool keep_always, uint64_t offset, uint64_t size, void **ret) { ++static unsigned type_to_context(ObjectType type) { ++ /* One context for each type, plus one catch-all for the rest */ ++ assert_cc(_OBJECT_TYPE_MAX <= MMAP_CACHE_MAX_CONTEXTS); ++ return type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX ? type : 0; ++} ++ ++static int journal_file_move_to(JournalFile *f, ObjectType type, bool keep_always, uint64_t offset, uint64_t size, void **ret) { + assert(f); + assert(ret); + +@@ -391,7 +397,7 @@ static int journal_file_move_to(JournalFile *f, int context, bool keep_always, u + return -EADDRNOTAVAIL; + } + +- return mmap_cache_get(f->mmap, f->fd, f->prot, context, keep_always, offset, size, &f->last_stat, ret, NULL); ++ return mmap_cache_get(f->mmap, f->fd, f->prot, type_to_context(type), keep_always, offset, size, &f->last_stat, ret); + } + + static uint64_t minimum_header_size(Object *o) { +@@ -412,7 +418,7 @@ static uint64_t minimum_header_size(Object *o) { + return table[o->object.type]; + } + +-int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret) { ++int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret) { + int r; + void *t; + Object *o; +@@ -425,7 +431,7 @@ int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec + if (!VALID64(offset)) + return -EFAULT; + +- r = journal_file_move_to(f, type_to_context(type), false, offset, sizeof(ObjectHeader), &t); ++ r = journal_file_move_to(f, type, false, offset, sizeof(ObjectHeader), &t); + if (r < 0) + return r; + +@@ -441,11 +447,11 @@ int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Objec + if (s < minimum_header_size(o)) + return -EBADMSG; + +- if (type > 0 && o->object.type != type) ++ if (type > OBJECT_UNUSED && o->object.type != type) + return -EBADMSG; + + if (s > sizeof(ObjectHeader)) { +- r = journal_file_move_to(f, o->object.type, false, offset, s, &t); ++ r = journal_file_move_to(f, type, false, offset, s, &t); + if (r < 0) + return r; + +@@ -482,14 +488,14 @@ static uint64_t journal_file_entry_seqnum(JournalFile *f, uint64_t *seqnum) { + return r; + } + +-int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset) { ++int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset) { + int r; + uint64_t p; + Object *tail, *o; + void *t; + + assert(f); +- assert(type > 0 && type < _OBJECT_TYPE_MAX); ++ assert(type > OBJECT_UNUSED && type < _OBJECT_TYPE_MAX); + assert(size >= sizeof(ObjectHeader)); + assert(offset); + assert(ret); +@@ -502,7 +508,7 @@ int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object * + if (p == 0) + p = le64toh(f->header->header_size); + else { +- r = journal_file_move_to_object(f, -1, p, &tail); ++ r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &tail); + if (r < 0) + return r; + +@@ -1657,7 +1663,7 @@ static int generic_array_bisect( } } @@ -285,6 +505,369 @@ index 8a2c0fc..9de3ddd 100644 if (direction == DIRECTION_UP) { i = n; subtract_one = true; +@@ -1793,23 +1799,6 @@ _pure_ static int test_object_offset(JournalFile *f, uint64_t p, uint64_t needle + return TEST_RIGHT; + } + +-int journal_file_move_to_entry_by_offset( +- JournalFile *f, +- uint64_t p, +- direction_t direction, +- Object **ret, +- uint64_t *offset) { +- +- return generic_array_bisect(f, +- le64toh(f->header->entry_array_offset), +- le64toh(f->header->n_entries), +- p, +- test_object_offset, +- direction, +- ret, offset, NULL); +-} +- +- + static int test_object_seqnum(JournalFile *f, uint64_t p, uint64_t needle) { + Object *o; + int r; +@@ -1939,9 +1928,81 @@ int journal_file_move_to_entry_by_monotonic( + ret, offset, NULL); + } + ++void journal_file_reset_location(JournalFile *f) { ++ f->location_type = LOCATION_HEAD; ++ f->current_offset = 0; ++ f->current_seqnum = 0; ++ f->current_realtime = 0; ++ f->current_monotonic = 0; ++ zero(f->current_boot_id); ++ f->current_xor_hash = 0; ++} ++ ++void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset) { ++ f->location_type = LOCATION_SEEK; ++ f->current_offset = offset; ++ f->current_seqnum = le64toh(o->entry.seqnum); ++ f->current_realtime = le64toh(o->entry.realtime); ++ f->current_monotonic = le64toh(o->entry.monotonic); ++ f->current_boot_id = o->entry.boot_id; ++ f->current_xor_hash = le64toh(o->entry.xor_hash); ++} ++ ++int journal_file_compare_locations(JournalFile *af, JournalFile *bf) { ++ assert(af); ++ assert(bf); ++ assert(af->location_type == LOCATION_SEEK); ++ assert(bf->location_type == LOCATION_SEEK); ++ ++ /* If contents and timestamps match, these entries are ++ * identical, even if the seqnum does not match */ ++ if (sd_id128_equal(af->current_boot_id, bf->current_boot_id) && ++ af->current_monotonic == bf->current_monotonic && ++ af->current_realtime == bf->current_realtime && ++ af->current_xor_hash == bf->current_xor_hash) ++ return 0; ++ ++ if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) { ++ ++ /* If this is from the same seqnum source, compare ++ * seqnums */ ++ if (af->current_seqnum < bf->current_seqnum) ++ return -1; ++ if (af->current_seqnum > bf->current_seqnum) ++ return 1; ++ ++ /* Wow! This is weird, different data but the same ++ * seqnums? Something is borked, but let's make the ++ * best of it and compare by time. */ ++ } ++ ++ if (sd_id128_equal(af->current_boot_id, bf->current_boot_id)) { ++ ++ /* If the boot id matches, compare monotonic time */ ++ if (af->current_monotonic < bf->current_monotonic) ++ return -1; ++ if (af->current_monotonic > bf->current_monotonic) ++ return 1; ++ } ++ ++ /* Otherwise, compare UTC time */ ++ if (af->current_realtime < bf->current_realtime) ++ return -1; ++ if (af->current_realtime > bf->current_realtime) ++ return 1; ++ ++ /* Finally, compare by contents */ ++ if (af->current_xor_hash < bf->current_xor_hash) ++ return -1; ++ if (af->current_xor_hash > bf->current_xor_hash) ++ return 1; ++ ++ return 0; ++} ++ + int journal_file_next_entry( + JournalFile *f, +- Object *o, uint64_t p, ++ uint64_t p, + direction_t direction, + Object **ret, uint64_t *offset) { + +@@ -1949,18 +2010,14 @@ int journal_file_next_entry( + int r; + + assert(f); +- assert(p > 0 || !o); + + n = le64toh(f->header->n_entries); + if (n <= 0) + return 0; + +- if (!o) ++ if (p == 0) + i = direction == DIRECTION_DOWN ? 0 : n - 1; + else { +- if (o->object.type != OBJECT_ENTRY) +- return -EINVAL; +- + r = generic_array_bisect(f, + le64toh(f->header->entry_array_offset), + le64toh(f->header->n_entries), +@@ -2006,55 +2063,6 @@ int journal_file_next_entry( + return 1; + } + +-int journal_file_skip_entry( +- JournalFile *f, +- Object *o, uint64_t p, +- int64_t skip, +- Object **ret, uint64_t *offset) { +- +- uint64_t i, n; +- int r; +- +- assert(f); +- assert(o); +- assert(p > 0); +- +- if (o->object.type != OBJECT_ENTRY) +- return -EINVAL; +- +- r = generic_array_bisect(f, +- le64toh(f->header->entry_array_offset), +- le64toh(f->header->n_entries), +- p, +- test_object_offset, +- DIRECTION_DOWN, +- NULL, NULL, +- &i); +- if (r <= 0) +- return r; +- +- /* Calculate new index */ +- if (skip < 0) { +- if ((uint64_t) -skip >= i) +- i = 0; +- else +- i = i - (uint64_t) -skip; +- } else +- i += (uint64_t) skip; +- +- n = le64toh(f->header->n_entries); +- if (n <= 0) +- return -EBADMSG; +- +- if (i >= n) +- i = n-1; +- +- return generic_array_get(f, +- le64toh(f->header->entry_array_offset), +- i, +- ret, offset); +-} +- + int journal_file_next_entry_for_data( + JournalFile *f, + Object *o, uint64_t p, +@@ -2289,7 +2297,7 @@ void journal_file_dump(JournalFile *f) { + + p = le64toh(f->header->header_size); + while (p != 0) { +- r = journal_file_move_to_object(f, -1, p, &o); ++ r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o); + if (r < 0) + goto fail; + +diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h +index 211e121..ca17c97 100644 +--- a/src/journal/journal-file.h ++++ b/src/journal/journal-file.h +@@ -48,6 +48,20 @@ typedef enum direction { + DIRECTION_DOWN + } direction_t; + ++typedef enum LocationType { ++ /* The first and last entries, resp. */ ++ LOCATION_HEAD, ++ LOCATION_TAIL, ++ ++ /* We already read the entry we currently point to, and the ++ * next one to read should probably not be this one again. */ ++ LOCATION_DISCRETE, ++ ++ /* We should seek to the precise location specified, and ++ * return it, as we haven't read it yet. */ ++ LOCATION_SEEK ++} LocationType; ++ + typedef struct JournalFile { + int fd; + +@@ -63,6 +77,8 @@ typedef struct JournalFile { + bool tail_entry_monotonic_valid:1; + + direction_t last_direction; ++ LocationType location_type; ++ uint64_t last_n_entries; + + char *path; + struct stat last_stat; +@@ -72,6 +88,11 @@ typedef struct JournalFile { + HashItem *field_hash_table; + + uint64_t current_offset; ++ uint64_t current_seqnum; ++ uint64_t current_realtime; ++ uint64_t current_monotonic; ++ sd_id128_t current_boot_id; ++ uint64_t current_xor_hash; + + JournalMetrics metrics; + MMapCache *mmap; +@@ -160,13 +181,13 @@ static inline bool VALID_EPOCH(uint64_t u) { + #define JOURNAL_HEADER_COMPRESSED_LZ4(h) \ + (!!(le32toh((h)->incompatible_flags) & HEADER_INCOMPATIBLE_COMPRESSED_LZ4)) + +-int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset, Object **ret); ++int journal_file_move_to_object(JournalFile *f, ObjectType type, uint64_t offset, Object **ret); + + uint64_t journal_file_entry_n_items(Object *o) _pure_; + uint64_t journal_file_entry_array_n_items(Object *o) _pure_; + uint64_t journal_file_hash_table_n_items(Object *o) _pure_; + +-int journal_file_append_object(JournalFile *f, int type, uint64_t size, Object **ret, uint64_t *offset); ++int journal_file_append_object(JournalFile *f, ObjectType type, uint64_t size, Object **ret, uint64_t *offset); + int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, uint64_t *offset); + + int journal_file_find_data_object(JournalFile *f, const void *data, uint64_t size, Object **ret, uint64_t *offset); +@@ -175,12 +196,13 @@ int journal_file_find_data_object_with_hash(JournalFile *f, const void *data, ui + int journal_file_find_field_object(JournalFile *f, const void *field, uint64_t size, Object **ret, uint64_t *offset); + int journal_file_find_field_object_with_hash(JournalFile *f, const void *field, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset); + +-int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, direction_t direction, Object **ret, uint64_t *offset); +-int journal_file_skip_entry(JournalFile *f, Object *o, uint64_t p, int64_t skip, Object **ret, uint64_t *offset); ++void journal_file_reset_location(JournalFile *f); ++void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset); ++int journal_file_compare_locations(JournalFile *af, JournalFile *bf); ++int journal_file_next_entry(JournalFile *f, uint64_t p, direction_t direction, Object **ret, uint64_t *offset); + + int journal_file_next_entry_for_data(JournalFile *f, Object *o, uint64_t p, uint64_t data_offset, direction_t direction, Object **ret, uint64_t *offset); + +-int journal_file_move_to_entry_by_offset(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset); + int journal_file_move_to_entry_by_seqnum(JournalFile *f, uint64_t seqnum, direction_t direction, Object **ret, uint64_t *offset); + int journal_file_move_to_entry_by_realtime(JournalFile *f, uint64_t realtime, direction_t direction, Object **ret, uint64_t *offset); + int journal_file_move_to_entry_by_monotonic(JournalFile *f, sd_id128_t boot_id, uint64_t monotonic, direction_t direction, Object **ret, uint64_t *offset); +@@ -205,21 +227,3 @@ int journal_file_get_cutoff_realtime_usec(JournalFile *f, usec_t *from, usec_t * + int journal_file_get_cutoff_monotonic_usec(JournalFile *f, sd_id128_t boot, usec_t *from, usec_t *to); + + bool journal_file_rotate_suggested(JournalFile *f, usec_t max_file_usec); +- +- +-static unsigned type_to_context(int type) { +- /* One context for each type, plus one catch-all for the rest */ +- return type > 0 && type < _OBJECT_TYPE_MAX ? type : 0; +-} +- +-static inline int journal_file_object_keep(JournalFile *f, Object *o, uint64_t offset, void **release_cookie) { +- unsigned context = type_to_context(o->object.type); +- uint64_t s = le64toh(o->object.size); +- +- return mmap_cache_get(f->mmap, f->fd, f->prot, context, true, +- offset, s, &f->last_stat, NULL, release_cookie); +-} +- +-static inline int journal_file_object_release(JournalFile *f, void *release_cookie) { +- return mmap_cache_release(f->mmap, f->fd, release_cookie); +-} +diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h +index 70847db..e99050c 100644 +--- a/src/journal/journal-internal.h ++++ b/src/journal/journal-internal.h +@@ -57,20 +57,6 @@ struct Match { + LIST_HEAD(Match, matches); + }; + +-typedef enum LocationType { +- /* The first and last entries, resp. */ +- LOCATION_HEAD, +- LOCATION_TAIL, +- +- /* We already read the entry we currently point to, and the +- * next one to read should probably not be this one again. */ +- LOCATION_DISCRETE, +- +- /* We should seek to the precise location specified, and +- * return it, as we haven't read it yet. */ +- LOCATION_SEEK +-} LocationType; +- + struct Location { + LocationType type; + +diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c +index f74adcb..5baa22d 100644 +--- a/src/journal/journal-verify.c ++++ b/src/journal/journal-verify.c +@@ -368,7 +368,7 @@ static int contains_uint64(MMapCache *m, int fd, uint64_t n, uint64_t p) { + + c = (a + b) / 2; + +- r = mmap_cache_get(m, fd, PROT_READ|PROT_WRITE, 0, false, c * sizeof(uint64_t), sizeof(uint64_t), NULL, (void **) &z, NULL); ++ r = mmap_cache_get(m, fd, PROT_READ|PROT_WRITE, 0, false, c * sizeof(uint64_t), sizeof(uint64_t), NULL, (void **) &z); + if (r < 0) + return r; + +@@ -865,7 +865,7 @@ int journal_file_verify( + if (show_progress) + draw_progress(0x7FFF * p / le64toh(f->header->tail_object_offset), &last_usec); + +- r = journal_file_move_to_object(f, -1, p, &o); ++ r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o); + if (r < 0) { + error(p, "invalid object"); + goto fail; +@@ -1085,11 +1085,11 @@ int journal_file_verify( + q = last_tag; + + while (q <= p) { +- r = journal_file_move_to_object(f, -1, q, &o); ++ r = journal_file_move_to_object(f, OBJECT_UNUSED, q, &o); + if (r < 0) + goto fail; + +- r = journal_file_hmac_put_object(f, -1, o, q); ++ r = journal_file_hmac_put_object(f, OBJECT_UNUSED, o, q); + if (r < 0) + goto fail; + +@@ -1097,7 +1097,7 @@ int journal_file_verify( + } + + /* Position might have changed, let's reposition things */ +- r = journal_file_move_to_object(f, -1, p, &o); ++ r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o); + if (r < 0) + goto fail; + diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index f50faf4..03579fd 100644 --- a/src/journal/journalctl.c @@ -298,6 +881,21 @@ index f50faf4..03579fd 100644 arg_lines = 10; if (!!arg_directory + !!arg_file + !!arg_machine > 1) { +diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c +index a635202..655e2dd 100644 +--- a/src/journal/journald-native.c ++++ b/src/journal/journald-native.c +@@ -132,8 +132,8 @@ void server_process_native_message( + + /* A property follows */ + +- /* n received properties, +1 for _TRANSPORT */ +- if (!GREEDY_REALLOC(iovec, m, n + 1 + N_IOVEC_META_FIELDS + !!object_pid * N_IOVEC_OBJECT_FIELDS)) { ++ /* n existing properties, 1 new, +1 for _TRANSPORT */ ++ if (!GREEDY_REALLOC(iovec, m, n + 2 + N_IOVEC_META_FIELDS + N_IOVEC_OBJECT_FIELDS)) { + log_oom(); + break; + } diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 12735c4..08b143b 100644 --- a/src/journal/journald-server.c @@ -310,6 +908,739 @@ index 12735c4..08b143b 100644 if (s->mmap) mmap_cache_unref(s->mmap); +diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c +index b7db6f1..f6f669d 100644 +--- a/src/journal/mmap-cache.c ++++ b/src/journal/mmap-cache.c +@@ -38,7 +38,7 @@ typedef struct FileDescriptor FileDescriptor; + struct Window { + MMapCache *cache; + +- unsigned keep_always; ++ bool keep_always; + bool in_unused; + + int prot; +@@ -76,7 +76,7 @@ struct MMapCache { + + + Hashmap *fds; +- Hashmap *contexts; ++ Context *contexts[MMAP_CACHE_MAX_CONTEXTS]; + + LIST_HEAD(Window, unused); + Window *last_unused; +@@ -185,7 +185,7 @@ static void context_detach_window(Context *c) { + c->window = NULL; + LIST_REMOVE(by_window, w->contexts, c); + +- if (!w->contexts && w->keep_always == 0) { ++ if (!w->contexts && !w->keep_always) { + /* Not used anymore? */ + LIST_PREPEND(unused, c->cache->unused, w); + if (!c->cache->last_unused) +@@ -219,18 +219,13 @@ static void context_attach_window(Context *c, Window *w) { + + static Context *context_add(MMapCache *m, unsigned id) { + Context *c; +- int r; + + assert(m); + +- c = hashmap_get(m->contexts, UINT_TO_PTR(id + 1)); ++ c = m->contexts[id]; + if (c) + return c; + +- r = hashmap_ensure_allocated(&m->contexts, NULL); +- if (r < 0) +- return NULL; +- + c = new0(Context, 1); + if (!c) + return NULL; +@@ -238,11 +233,8 @@ static Context *context_add(MMapCache *m, unsigned id) { + c->cache = m; + c->id = id; + +- r = hashmap_put(m->contexts, UINT_TO_PTR(id + 1), c); +- if (r < 0) { +- free(c); +- return NULL; +- } ++ assert(!m->contexts[id]); ++ m->contexts[id] = c; + + return c; + } +@@ -252,8 +244,10 @@ static void context_free(Context *c) { + + context_detach_window(c); + +- if (c->cache) +- assert_se(hashmap_remove(c->cache->contexts, UINT_TO_PTR(c->id + 1))); ++ if (c->cache) { ++ assert(c->cache->contexts[c->id] == c); ++ c->cache->contexts[c->id] = NULL; ++ } + + free(c); + } +@@ -302,15 +296,14 @@ static FileDescriptor* fd_add(MMapCache *m, int fd) { + } + + static void mmap_cache_free(MMapCache *m) { +- Context *c; + FileDescriptor *f; ++ int i; + + assert(m); + +- while ((c = hashmap_first(m->contexts))) +- context_free(c); +- +- hashmap_free(m->contexts); ++ for (i = 0; i < MMAP_CACHE_MAX_CONTEXTS; i++) ++ if (m->contexts[i]) ++ context_free(m->contexts[i]); + + while ((f = hashmap_first(m->fds))) + fd_free(f); +@@ -352,8 +345,7 @@ static int try_context( + bool keep_always, + uint64_t offset, + size_t size, +- void **ret, +- void **release_cookie) { ++ void **ret) { + + Context *c; + +@@ -361,8 +353,9 @@ static int try_context( + assert(m->n_ref > 0); + assert(fd >= 0); + assert(size > 0); ++ assert(ret); + +- c = hashmap_get(m->contexts, UINT_TO_PTR(context+1)); ++ c = m->contexts[context]; + if (!c) + return 0; + +@@ -378,12 +371,9 @@ static int try_context( + return 0; + } + +- c->window->keep_always += keep_always; ++ c->window->keep_always |= keep_always; + +- if (ret) +- *ret = (uint8_t*) c->window->ptr + (offset - c->window->offset); +- if (keep_always && release_cookie) +- *release_cookie = c->window; ++ *ret = (uint8_t*) c->window->ptr + (offset - c->window->offset); + return 1; + } + +@@ -395,8 +385,7 @@ static int find_mmap( + bool keep_always, + uint64_t offset, + size_t size, +- void **ret, +- void **release_cookie) { ++ void **ret) { + + FileDescriptor *f; + Window *w; +@@ -427,10 +416,7 @@ static int find_mmap( + context_attach_window(c, w); + w->keep_always += keep_always; + +- if (ret) +- *ret = (uint8_t*) w->ptr + (offset - w->offset); +- if (keep_always && release_cookie) +- *release_cookie = c->window; ++ *ret = (uint8_t*) w->ptr + (offset - w->offset); + return 1; + } + +@@ -443,8 +429,7 @@ static int add_mmap( + uint64_t offset, + size_t size, + struct stat *st, +- void **ret, +- void **release_cookie) { ++ void **ret) { + + uint64_t woffset, wsize; + Context *c; +@@ -457,6 +442,7 @@ static int add_mmap( + assert(m->n_ref > 0); + assert(fd >= 0); + assert(size > 0); ++ assert(ret); + + woffset = offset & ~((uint64_t) page_size() - 1ULL); + wsize = size + (offset - woffset); +@@ -526,10 +512,7 @@ static int add_mmap( + c->window = w; + LIST_PREPEND(by_window, w->contexts, c); + +- if (ret) +- *ret = (uint8_t*) w->ptr + (offset - w->offset); +- if (keep_always && release_cookie) +- *release_cookie = c->window; ++ *ret = (uint8_t*) w->ptr + (offset - w->offset); + return 1; + + outofmem: +@@ -546,8 +529,7 @@ int mmap_cache_get( + uint64_t offset, + size_t size, + struct stat *st, +- void **ret, +- void **release_cookie) { ++ void **ret) { + + int r; + +@@ -555,16 +537,18 @@ int mmap_cache_get( + assert(m->n_ref > 0); + assert(fd >= 0); + assert(size > 0); ++ assert(ret); ++ assert(context < MMAP_CACHE_MAX_CONTEXTS); + + /* Check whether the current context is the right one already */ +- r = try_context(m, fd, prot, context, keep_always, offset, size, ret, release_cookie); ++ r = try_context(m, fd, prot, context, keep_always, offset, size, ret); + if (r != 0) { + m->n_hit ++; + return r; + } + + /* Search for a matching mmap */ +- r = find_mmap(m, fd, prot, context, keep_always, offset, size, ret, release_cookie); ++ r = find_mmap(m, fd, prot, context, keep_always, offset, size, ret); + if (r != 0) { + m->n_hit ++; + return r; +@@ -573,39 +557,7 @@ int mmap_cache_get( + m->n_missed++; + + /* Create a new mmap */ +- return add_mmap(m, fd, prot, context, keep_always, offset, size, st, ret, release_cookie); +-} +- +-int mmap_cache_release( +- MMapCache *m, +- int fd, +- void *release_cookie) { +- +- FileDescriptor *f; +- Window *w; +- +- assert(m); +- assert(m->n_ref > 0); +- assert(fd >= 0); +- +- f = hashmap_get(m->fds, INT_TO_PTR(fd + 1)); +- if (!f) +- return -EBADF; +- +- assert(f->fd == fd); +- +- LIST_FOREACH(by_fd, w, f->windows) +- if (w == release_cookie) +- break; +- +- if (!w) +- return -ENOENT; +- +- if (w->keep_always == 0) +- return -ENOLCK; +- +- w->keep_always -= 1; +- return 0; ++ return add_mmap(m, fd, prot, context, keep_always, offset, size, st, ret); + } + + void mmap_cache_close_fd(MMapCache *m, int fd) { +@@ -621,18 +573,6 @@ void mmap_cache_close_fd(MMapCache *m, int fd) { + fd_free(f); + } + +-void mmap_cache_close_context(MMapCache *m, unsigned context) { +- Context *c; +- +- assert(m); +- +- c = hashmap_get(m->contexts, UINT_TO_PTR(context + 1)); +- if (!c) +- return; +- +- context_free(c); +-} +- + unsigned mmap_cache_get_hit(MMapCache *m) { + assert(m); + +diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h +index 76e5316..fe2c83d 100644 +--- a/src/journal/mmap-cache.h ++++ b/src/journal/mmap-cache.h +@@ -25,6 +25,8 @@ + #include <stdbool.h> + #include <sys/stat.h> + ++#define MMAP_CACHE_MAX_CONTEXTS 8 ++ + typedef struct MMapCache MMapCache; + + MMapCache* mmap_cache_new(void); +@@ -40,14 +42,8 @@ int mmap_cache_get( + uint64_t offset, + size_t size, + struct stat *st, +- void **ret, +- void **release_cookie); +-int mmap_cache_release( +- MMapCache *m, +- int fd, +- void *release_cookie); ++ void **ret); + void mmap_cache_close_fd(MMapCache *m, int fd); +-void mmap_cache_close_context(MMapCache *m, unsigned context); + + unsigned mmap_cache_get_hit(MMapCache *m); + unsigned mmap_cache_get_missed(MMapCache *m); +diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c +index cf21c4d..cb7fc32 100644 +--- a/src/journal/sd-journal.c ++++ b/src/journal/sd-journal.c +@@ -87,7 +87,7 @@ static void detach_location(sd_journal *j) { + j->current_field = 0; + + ORDERED_HASHMAP_FOREACH(f, j->files, i) +- f->current_offset = 0; ++ journal_file_reset_location(f); + } + + static void reset_location(sd_journal *j) { +@@ -114,20 +114,19 @@ static void init_location(Location *l, LocationType type, JournalFile *f, Object + l->seqnum_set = l->realtime_set = l->monotonic_set = l->xor_hash_set = true; + } + +-static void set_location(sd_journal *j, LocationType type, JournalFile *f, Object *o, +- direction_t direction, uint64_t offset) { ++static void set_location(sd_journal *j, JournalFile *f, Object *o) { + assert(j); +- assert(type == LOCATION_DISCRETE || type == LOCATION_SEEK); + assert(f); + assert(o); + +- init_location(&j->current_location, type, f, o); ++ init_location(&j->current_location, LOCATION_DISCRETE, f, o); + + j->current_file = f; + j->current_field = 0; + +- f->last_direction = direction; +- f->current_offset = offset; ++ /* Let f know its candidate entry was picked. */ ++ assert(f->location_type == LOCATION_SEEK); ++ f->location_type = LOCATION_DISCRETE; + } + + static int match_is_valid(const void *data, size_t size) { +@@ -413,144 +412,51 @@ _public_ void sd_journal_flush_matches(sd_journal *j) { + detach_location(j); + } + +-static int compare_entry_order(JournalFile *af, Object *_ao, +- JournalFile *bf, uint64_t bp) { +- +- uint64_t a, b; +- Object *ao, *bo; +- int r; +- +- assert(af); +- assert(bf); +- assert(_ao); +- +- /* The mmap cache might invalidate the object from the first +- * file if we look at the one from the second file. Hence +- * temporarily copy the header of the first one, and look at +- * that only. */ +- ao = alloca(offsetof(EntryObject, items)); +- memcpy(ao, _ao, offsetof(EntryObject, items)); +- +- r = journal_file_move_to_object(bf, OBJECT_ENTRY, bp, &bo); +- if (r < 0) +- return strcmp(af->path, bf->path); +- +- /* We operate on two different files here, hence we can access +- * two objects at the same time, which we normally can't. +- * +- * If contents and timestamps match, these entries are +- * identical, even if the seqnum does not match */ +- +- if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id) && +- ao->entry.monotonic == bo->entry.monotonic && +- ao->entry.realtime == bo->entry.realtime && +- ao->entry.xor_hash == bo->entry.xor_hash) +- return 0; +- +- if (sd_id128_equal(af->header->seqnum_id, bf->header->seqnum_id)) { +- +- /* If this is from the same seqnum source, compare +- * seqnums */ +- a = le64toh(ao->entry.seqnum); +- b = le64toh(bo->entry.seqnum); +- +- if (a < b) +- return -1; +- if (a > b) +- return 1; +- +- /* Wow! This is weird, different data but the same +- * seqnums? Something is borked, but let's make the +- * best of it and compare by time. */ +- } +- +- if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) { +- +- /* If the boot id matches, compare monotonic time */ +- a = le64toh(ao->entry.monotonic); +- b = le64toh(bo->entry.monotonic); +- +- if (a < b) +- return -1; +- if (a > b) +- return 1; +- } +- +- /* Otherwise, compare UTC time */ +- a = le64toh(ao->entry.realtime); +- b = le64toh(bo->entry.realtime); +- +- if (a < b) +- return -1; +- if (a > b) +- return 1; +- +- /* Finally, compare by contents */ +- a = le64toh(ao->entry.xor_hash); +- b = le64toh(bo->entry.xor_hash); +- +- if (a < b) +- return -1; +- if (a > b) +- return 1; +- +- return 0; +-} +- +-_pure_ static int compare_with_location(JournalFile *af, Object *ao, Location *l) { +- uint64_t a; +- +- assert(af); +- assert(ao); ++_pure_ static int compare_with_location(JournalFile *f, Location *l) { ++ assert(f); + assert(l); ++ assert(f->location_type == LOCATION_SEEK); + assert(l->type == LOCATION_DISCRETE || l->type == LOCATION_SEEK); + + if (l->monotonic_set && +- sd_id128_equal(ao->entry.boot_id, l->boot_id) && ++ sd_id128_equal(f->current_boot_id, l->boot_id) && + l->realtime_set && +- le64toh(ao->entry.realtime) == l->realtime && ++ f->current_realtime == l->realtime && + l->xor_hash_set && +- le64toh(ao->entry.xor_hash) == l->xor_hash) ++ f->current_xor_hash == l->xor_hash) + return 0; + + if (l->seqnum_set && +- sd_id128_equal(af->header->seqnum_id, l->seqnum_id)) { +- +- a = le64toh(ao->entry.seqnum); ++ sd_id128_equal(f->header->seqnum_id, l->seqnum_id)) { + +- if (a < l->seqnum) ++ if (f->current_seqnum < l->seqnum) + return -1; +- if (a > l->seqnum) ++ if (f->current_seqnum > l->seqnum) + return 1; + } + + if (l->monotonic_set && +- sd_id128_equal(ao->entry.boot_id, l->boot_id)) { ++ sd_id128_equal(f->current_boot_id, l->boot_id)) { + +- a = le64toh(ao->entry.monotonic); +- +- if (a < l->monotonic) ++ if (f->current_monotonic < l->monotonic) + return -1; +- if (a > l->monotonic) ++ if (f->current_monotonic > l->monotonic) + return 1; + } + + if (l->realtime_set) { + +- a = le64toh(ao->entry.realtime); +- +- if (a < l->realtime) ++ if (f->current_realtime < l->realtime) + return -1; +- if (a > l->realtime) ++ if (f->current_realtime > l->realtime) + return 1; + } + + if (l->xor_hash_set) { +- a = le64toh(ao->entry.xor_hash); + +- if (a < l->xor_hash) ++ if (f->current_xor_hash < l->xor_hash) + return -1; +- if (a > l->xor_hash) ++ if (f->current_xor_hash > l->xor_hash) + return 1; + } + +@@ -766,9 +672,9 @@ static int find_location_with_matches( + /* No matches is simple */ + + if (j->current_location.type == LOCATION_HEAD) +- return journal_file_next_entry(f, NULL, 0, DIRECTION_DOWN, ret, offset); ++ return journal_file_next_entry(f, 0, DIRECTION_DOWN, ret, offset); + if (j->current_location.type == LOCATION_TAIL) +- return journal_file_next_entry(f, NULL, 0, DIRECTION_UP, ret, offset); ++ return journal_file_next_entry(f, 0, DIRECTION_UP, ret, offset); + if (j->current_location.seqnum_set && sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id)) + return journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, ret, offset); + if (j->current_location.monotonic_set) { +@@ -779,7 +685,7 @@ static int find_location_with_matches( + if (j->current_location.realtime_set) + return journal_file_move_to_entry_by_realtime(f, j->current_location.realtime, direction, ret, offset); + +- return journal_file_next_entry(f, NULL, 0, direction, ret, offset); ++ return journal_file_next_entry(f, 0, direction, ret, offset); + } else + return find_location_for_match(j, j->level0, f, direction, ret, offset); + } +@@ -791,49 +697,61 @@ static int next_with_matches( + Object **ret, + uint64_t *offset) { + +- Object *c; +- uint64_t cp; +- + assert(j); + assert(f); + assert(ret); + assert(offset); + +- c = *ret; +- cp = *offset; +- + /* No matches is easy. We simple advance the file + * pointer by one. */ + if (!j->level0) +- return journal_file_next_entry(f, c, cp, direction, ret, offset); ++ return journal_file_next_entry(f, f->current_offset, direction, ret, offset); + + /* If we have a match then we look for the next matching entry + * with an offset at least one step larger */ +- return next_for_match(j, j->level0, f, direction == DIRECTION_DOWN ? cp+1 : cp-1, direction, ret, offset); ++ return next_for_match(j, j->level0, f, ++ direction == DIRECTION_DOWN ? f->current_offset + 1 ++ : f->current_offset - 1, ++ direction, ret, offset); + } + +-static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction, Object **ret, uint64_t *offset) { ++static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direction) { + Object *c; +- uint64_t cp; ++ uint64_t cp, n_entries; + int r; + + assert(j); + assert(f); + +- if (f->last_direction == direction && f->current_offset > 0) { +- cp = f->current_offset; ++ n_entries = le64toh(f->header->n_entries); + +- r = journal_file_move_to_object(f, OBJECT_ENTRY, cp, &c); +- if (r < 0) +- return r; ++ /* If we hit EOF before, we don't need to look into this file again ++ * unless direction changed or new entries appeared. */ ++ if (f->last_direction == direction && f->location_type == LOCATION_TAIL && ++ n_entries == f->last_n_entries) ++ return 0; + +- r = next_with_matches(j, f, direction, &c, &cp); +- if (r <= 0) +- return r; ++ f->last_n_entries = n_entries; ++ ++ if (f->last_direction == direction && f->current_offset > 0) { ++ /* LOCATION_SEEK here means we did the work in a previous ++ * iteration and the current location already points to a ++ * candidate entry. */ ++ if (f->location_type != LOCATION_SEEK) { ++ r = next_with_matches(j, f, direction, &c, &cp); ++ if (r <= 0) ++ return r; ++ ++ journal_file_save_location(f, c, cp); ++ } + } else { ++ f->last_direction = direction; ++ + r = find_location_with_matches(j, f, direction, &c, &cp); + if (r <= 0) + return r; ++ ++ journal_file_save_location(f, c, cp); + } + + /* OK, we found the spot, now let's advance until an entry +@@ -848,30 +766,25 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc + if (j->current_location.type == LOCATION_DISCRETE) { + int k; + +- k = compare_with_location(f, c, &j->current_location); ++ k = compare_with_location(f, &j->current_location); + + found = direction == DIRECTION_DOWN ? k > 0 : k < 0; + } else + found = true; + +- if (found) { +- if (ret) +- *ret = c; +- if (offset) +- *offset = cp; ++ if (found) + return 1; +- } + + r = next_with_matches(j, f, direction, &c, &cp); + if (r <= 0) + return r; ++ ++ journal_file_save_location(f, c, cp); + } + } + + static int real_journal_next(sd_journal *j, direction_t direction) { + JournalFile *f, *new_file = NULL; +- uint64_t new_offset = 0; +- uint64_t p = 0; + Iterator i; + Object *o; + int r; +@@ -882,38 +795,38 @@ static int real_journal_next(sd_journal *j, direction_t direction) { + ORDERED_HASHMAP_FOREACH(f, j->files, i) { + bool found; + +- r = next_beyond_location(j, f, direction, &o, &p); ++ r = next_beyond_location(j, f, direction); + if (r < 0) { + log_debug("Can't iterate through %s, ignoring: %s", f->path, strerror(-r)); + remove_file_real(j, f); + continue; +- } else if (r == 0) ++ } else if (r == 0) { ++ f->location_type = LOCATION_TAIL; + continue; ++ } + + if (!new_file) + found = true; + else { + int k; + +- k = compare_entry_order(f, o, new_file, new_offset); ++ k = journal_file_compare_locations(f, new_file); + + found = direction == DIRECTION_DOWN ? k < 0 : k > 0; + } + +- if (found) { ++ if (found) + new_file = f; +- new_offset = p; +- } + } + + if (!new_file) + return 0; + +- r = journal_file_move_to_object(new_file, OBJECT_ENTRY, new_offset, &o); ++ r = journal_file_move_to_object(new_file, OBJECT_ENTRY, new_file->current_offset, &o); + if (r < 0) + return r; + +- set_location(j, LOCATION_DISCRETE, new_file, o, direction, new_offset); ++ set_location(j, new_file, o); + + return 1; + } +@@ -2526,7 +2439,6 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_ + size_t ol; + bool found; + int r; +- void *release_cookie; + + /* Proceed to next data object in the field's linked list */ + if (j->unique_offset == 0) { +@@ -2552,10 +2464,10 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_ + continue; + } + +- /* We do not use the type context here, but 0 instead, +- * so that we can look at this data object at the same ++ /* We do not use OBJECT_DATA context here, but OBJECT_UNUSED ++ * instead, so that we can look at this data object at the same + * time as one on another file */ +- r = journal_file_move_to_object(j->unique_file, 0, j->unique_offset, &o); ++ r = journal_file_move_to_object(j->unique_file, OBJECT_UNUSED, j->unique_offset, &o); + if (r < 0) + return r; + +@@ -2567,10 +2479,6 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_ + return -EBADMSG; + } + +- r = journal_file_object_keep(j->unique_file, o, j->unique_offset, &release_cookie); +- if (r < 0) +- return r; +- + r = return_data(j, j->unique_file, o, &odata, &ol); + if (r < 0) + return r; +@@ -2615,10 +2523,6 @@ _public_ int sd_journal_enumerate_unique(sd_journal *j, const void **data, size_ + found = true; + } + +- r = journal_file_object_release(j->unique_file, release_cookie); +- if (r < 0) +- return r; +- + if (found) + continue; + diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c index 372f3ed..d56ee51 100644 --- a/src/libsystemd-network/network-internal.c @@ -875,6 +2206,30 @@ index 28eaa6a..3866308 100644 reboot(RB_ENABLE_CAD); switch (a) { +diff --git a/src/systemd/sd-journal.h b/src/systemd/sd-journal.h +index eb24372..00237a2 100644 +--- a/src/systemd/sd-journal.h ++++ b/src/systemd/sd-journal.h +@@ -138,13 +138,15 @@ int sd_journal_reliable_fd(sd_journal *j); + int sd_journal_get_catalog(sd_journal *j, char **text); + int sd_journal_get_catalog_for_message_id(sd_id128_t id, char **text); + ++/* the inverse condition avoids ambiguity of danling 'else' after the macro */ + #define SD_JOURNAL_FOREACH(j) \ +- if (sd_journal_seek_head(j) >= 0) \ +- while (sd_journal_next(j) > 0) ++ if (sd_journal_seek_head(j) < 0) { } \ ++ else while (sd_journal_next(j) > 0) + ++/* the inverse condition avoids ambiguity of danling 'else' after the macro */ + #define SD_JOURNAL_FOREACH_BACKWARDS(j) \ +- if (sd_journal_seek_tail(j) >= 0) \ +- while (sd_journal_previous(j) > 0) ++ if (sd_journal_seek_tail(j) < 0) { } \ ++ else while (sd_journal_previous(j) > 0) + + #define SD_JOURNAL_FOREACH_DATA(j, data, l) \ + for (sd_journal_restart_data(j); sd_journal_enumerate_data((j), &(data), &(l)) > 0; ) diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 63d64b2..57264de 100644 --- a/src/test/test-path-util.c diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 1a22d094867d..aeb2c371c2ad 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "trace-cmd-${version}"; - version = "2.5.3"; + version = "2.6"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git"; rev = "refs/tags/trace-cmd-v${version}"; - sha256 = "32db3df07d0371c2b072029c6c86c4204be8cbbcb53840fa8c42dbf2e35c047b"; + sha256 = "42286440a45d1b24552a1d3cdb656dc648ad346fc426b5798bacdbffd3c4b226"; }; buildInputs = [ asciidoc libxslt ]; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 9e475f7aed99..fca9dab22619 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.30.0"; + name = "xf86-input-wacom-0.31.0"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "1xa1i2ks00fa20c5dlpqzlapzj638a7qm5c0wqc3qvgwliwy9m4a"; + sha256 = "0xiz5vpkp8zm5m2k909sbvm9v8rf6hwn3gvqr2msswc00hzp5sg7"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-1.patch b/pkgs/os-specific/linux/zfs/compat-4.2-1.patch new file mode 100644 index 000000000000..a789f82799ae --- /dev/null +++ b/pkgs/os-specific/linux/zfs/compat-4.2-1.patch @@ -0,0 +1,29 @@ +From e80da86447174b583e4b6cebedae2956fac926ee Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf <behlendorf1@llnl.gov> +Date: Tue, 14 Jul 2015 14:15:13 -0700 +Subject: [PATCH] Linux 4.2 compat: bdi_setup_and_register() + +The vfs_compat.h header should include the linux/backing-dev.h header +because it depends on the bdi_* functions defined there. In previous +kernels this header was being indirectly included which prevented a +build failure. + +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Richard Yao <ryao@gentoo.org> +Closes #3596 +--- + include/linux/vfs_compat.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h +index e8f8448..40832d9 100644 +--- a/include/linux/vfs_compat.h ++++ b/include/linux/vfs_compat.h +@@ -28,6 +28,7 @@ + #define _ZFS_VFS_H + + #include <sys/taskq.h> ++#include <linux/backing-dev.h> + + /* + * 2.6.28 API change, diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-2.patch b/pkgs/os-specific/linux/zfs/compat-4.2-2.patch new file mode 100644 index 000000000000..659349c95ac6 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/compat-4.2-2.patch @@ -0,0 +1,38 @@ +From 7eb333fbdde32dbebdcc88c35610159e207237c9 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf <behlendorf1@llnl.gov> +Date: Tue, 14 Jul 2015 14:57:55 -0700 +Subject: [PATCH] Linux 4.2 compat: remove bio->bi_cnt access + +Linux 4.2 commit torvalds/linux@dac5621 renamed bio->bi_cnt to +bio->__bi_cnt. Because this value is only used once in a block of +debug code it simplest just to remove the PANIC. To my knowledge +this debugging has never been hit or proved useful so this is no +great loss. + +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Richard Yao <ryao@gentoo.org> +Closes #3596 +--- + module/zfs/vdev_disk.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c +index 9cfc080..eb77c26 100644 +--- a/module/zfs/vdev_disk.c ++++ b/module/zfs/vdev_disk.c +@@ -426,15 +426,6 @@ BIO_END_IO_PROTO(vdev_disk_physio_completion, bio, size, error) + dio_request_t *dr = bio->bi_private; + int rc; + +- /* Fatal error but print some useful debugging before asserting */ +- if (dr == NULL) +- PANIC("dr == NULL, bio->bi_private == NULL\n" +- "bi_next: %p, bi_flags: %lx, bi_rw: %lu, bi_vcnt: %d\n" +- "bi_idx: %d, bi_size: %d, bi_end_io: %p, bi_cnt: %d\n", +- bio->bi_next, bio->bi_flags, bio->bi_rw, bio->bi_vcnt, +- BIO_BI_IDX(bio), BIO_BI_SIZE(bio), bio->bi_end_io, +- atomic_read(&bio->bi_cnt)); +- + #ifndef HAVE_2ARGS_BIO_END_IO_T + if (BIO_BI_SIZE(bio)) + return (1); diff --git a/pkgs/os-specific/linux/zfs/compat-4.2-3.patch b/pkgs/os-specific/linux/zfs/compat-4.2-3.patch new file mode 100644 index 000000000000..10ec3ef9cf48 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/compat-4.2-3.patch @@ -0,0 +1,214 @@ +From bd29109f1ac5be68f7f7c8bcb49e1b706fe899f0 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf <behlendorf1@llnl.gov> +Date: Wed, 15 Jul 2015 10:54:26 -0700 +Subject: [PATCH] Linux 4.2 compat: follow_link() / put_link() + +As of Linux 4.2 the kernel has completely retired the nameidata +structure. One of the few remaining consumers of this interface +were the follow_link() and put_link() callbacks. + +This patch adds the required checks to configure to detect the +interface change and updates the functions accordingly. Migrating +to the simple_follow_link() interface was considered but was decided +against ironically due to the increased complexity. + +It also should be noted that the kernel follow_link() and put_link() +interfaces changes several times after 4.1 and but before 4.2. This +means there is a narrow range of kernel commits which never appear +in an official tag of the Linux kernel which ZoL will not build. + +Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> +Signed-off-by: Richard Yao <ryao@gentoo.org> +Issue #3596 +--- + config/kernel-create-nameidata.m4 | 4 ++-- + config/kernel-follow-link-nameidata.m4 | 24 ++++++++++++++++++++++++ + config/kernel-lookup-nameidata.m4 | 4 ++-- + config/kernel-put-link-nameidata.m4 | 23 +++++++++++++++++++++++ + config/kernel.m4 | 2 ++ + module/zfs/zpl_inode.c | 31 +++++++++++++++++++++++++++---- + 6 files changed, 80 insertions(+), 8 deletions(-) + create mode 100644 config/kernel-follow-link-nameidata.m4 + create mode 100644 config/kernel-put-link-nameidata.m4 + +diff --git a/config/kernel-create-nameidata.m4 b/config/kernel-create-nameidata.m4 +index 9aad46f..a71490a 100644 +--- a/config/kernel-create-nameidata.m4 ++++ b/config/kernel-create-nameidata.m4 +@@ -2,7 +2,7 @@ dnl # + dnl # 3.6 API change + dnl # + AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [ +- AC_MSG_CHECKING([whether iops->create() takes struct nameidata]) ++ AC_MSG_CHECKING([whether iops->create() passes nameidata]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/fs.h> + +@@ -22,7 +22,7 @@ AC_DEFUN([ZFS_AC_KERNEL_CREATE_NAMEIDATA], [ + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_CREATE_NAMEIDATA, 1, +- [iops->create() operation takes nameidata]) ++ [iops->create() passes nameidata]) + ],[ + AC_MSG_RESULT(no) + ]) +diff --git a/config/kernel-follow-link-nameidata.m4 b/config/kernel-follow-link-nameidata.m4 +new file mode 100644 +index 0000000..88c85ac +--- /dev/null ++++ b/config/kernel-follow-link-nameidata.m4 +@@ -0,0 +1,24 @@ ++dnl # ++dnl # 4.2 API change ++dnl # This kernel retired the nameidata structure which forced the ++dnl # restructuring of the follow_link() prototype and how it is called. ++dnl # We check for the new interface rather than detecting the old one. ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_FOLLOW_LINK], [ ++ AC_MSG_CHECKING([whether iops->follow_link() passes nameidata]) ++ ZFS_LINUX_TRY_COMPILE([ ++ #include <linux/fs.h> ++ const char *follow_link(struct dentry *de, void **cookie) ++ { return "symlink"; } ++ static struct inode_operations iops __attribute__ ((unused)) = { ++ .follow_link = follow_link, ++ }; ++ ],[ ++ ],[ ++ AC_MSG_RESULT(no) ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_FOLLOW_LINK_NAMEIDATA, 1, ++ [iops->follow_link() nameidata]) ++ ]) ++]) +diff --git a/config/kernel-lookup-nameidata.m4 b/config/kernel-lookup-nameidata.m4 +index 6455603..43f5fb4 100644 +--- a/config/kernel-lookup-nameidata.m4 ++++ b/config/kernel-lookup-nameidata.m4 +@@ -2,7 +2,7 @@ dnl # + dnl # 3.6 API change + dnl # + AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ +- AC_MSG_CHECKING([whether iops->lookup() takes struct nameidata]) ++ AC_MSG_CHECKING([whether iops->lookup() passes nameidata]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/fs.h> + +@@ -18,7 +18,7 @@ AC_DEFUN([ZFS_AC_KERNEL_LOOKUP_NAMEIDATA], [ + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LOOKUP_NAMEIDATA, 1, +- [iops->lookup() operation takes nameidata]) ++ [iops->lookup() passes nameidata]) + ],[ + AC_MSG_RESULT(no) + ]) +diff --git a/config/kernel-put-link-nameidata.m4 b/config/kernel-put-link-nameidata.m4 +new file mode 100644 +index 0000000..0181ae5 +--- /dev/null ++++ b/config/kernel-put-link-nameidata.m4 +@@ -0,0 +1,23 @@ ++dnl # ++dnl # 4.2 API change ++dnl # This kernel retired the nameidata structure which forced the ++dnl # restructuring of the put_link() prototype and how it is called. ++dnl # We check for the new interface rather than detecting the old one. ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_PUT_LINK], [ ++ AC_MSG_CHECKING([whether iops->put_link() passes nameidata]) ++ ZFS_LINUX_TRY_COMPILE([ ++ #include <linux/fs.h> ++ void put_link(struct inode *ip, void *cookie) { return; } ++ static struct inode_operations iops __attribute__ ((unused)) = { ++ .put_link = put_link, ++ }; ++ ],[ ++ ],[ ++ AC_MSG_RESULT(no) ++ ],[ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_PUT_LINK_NAMEIDATA, 1, ++ [iops->put_link() nameidata]) ++ ]) ++]) +diff --git a/config/kernel.m4 b/config/kernel.m4 +index 806c574..5c97659 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -70,6 +70,8 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ + ZFS_AC_KERNEL_MKDIR_UMODE_T + ZFS_AC_KERNEL_LOOKUP_NAMEIDATA + ZFS_AC_KERNEL_CREATE_NAMEIDATA ++ ZFS_AC_KERNEL_FOLLOW_LINK ++ ZFS_AC_KERNEL_PUT_LINK + ZFS_AC_KERNEL_TRUNCATE_RANGE + ZFS_AC_KERNEL_AUTOMOUNT + ZFS_AC_KERNEL_ENCODE_FH_WITH_INODE +diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c +index 31251e7..70b5e12 100644 +--- a/module/zfs/zpl_inode.c ++++ b/module/zfs/zpl_inode.c +@@ -348,8 +348,13 @@ zpl_symlink(struct inode *dir, struct dentry *dentry, const char *name) + return (error); + } + ++#ifdef HAVE_FOLLOW_LINK_NAMEIDATA + static void * + zpl_follow_link(struct dentry *dentry, struct nameidata *nd) ++#else ++const char * ++zpl_follow_link(struct dentry *dentry, void **symlink_cookie) ++#endif + { + cred_t *cr = CRED(); + struct inode *ip = dentry->d_inode; +@@ -372,17 +377,28 @@ zpl_follow_link(struct dentry *dentry, struct nameidata *nd) + cookie = spl_fstrans_mark(); + error = -zfs_readlink(ip, &uio, cr); + spl_fstrans_unmark(cookie); +- if (error) { ++ ++ if (error) + kmem_free(link, MAXPATHLEN); ++ ++ crfree(cr); ++ ++#ifdef HAVE_FOLLOW_LINK_NAMEIDATA ++ if (error) + nd_set_link(nd, ERR_PTR(error)); +- } else { ++ else + nd_set_link(nd, link); +- } + +- crfree(cr); + return (NULL); ++#else ++ if (error) ++ return (ERR_PTR(error)); ++ else ++ return (*symlink_cookie = link); ++#endif + } + ++#ifdef HAVE_PUT_LINK_NAMEIDATA + static void + zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr) + { +@@ -391,6 +407,13 @@ zpl_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr) + if (!IS_ERR(link)) + kmem_free(link, MAXPATHLEN); + } ++#else ++static void ++zpl_put_link(struct inode *unused, void *symlink_cookie) ++{ ++ kmem_free(symlink_cookie, MAXPATHLEN); ++} ++#endif + + static int + zpl_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 399169b364eb..a4aa7b036b39 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -10,5 +10,10 @@ callPackage ./generic.nix (args // rec { sha256 = "192x4z5am5wgrr4hb5skshyr5a6af52xpnk6pni4hs4pxvlpcs37"; }; - patches = [ ./nix-build.patch ]; + patches = [ + ./nix-build.patch + ./compat-4.2-1.patch + ./compat-4.2-2.patch + ./compat-4.2-3.patch + ]; }) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 26c48076c4ea..f63a36ce5162 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,13 +1,13 @@ { callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-07-21"; + version = "2015-08-30"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; - rev = "3b79cef21294f3ec46c4f71cc5a68a75a4d0ebc7"; - sha256 = "01l4cg62wgn3wzasskx2nh3a4c74vq8qcwz090x8x1r4c2r4v943"; + rev = "c6a3a222d3a1d2af94205a218c0ba455200fb945"; + sha256 = "0alzkngw36ik4vpw0z8nnk5qysh2z6v231c23rw7jlcqfdd8ji8p"; }; patches = [ ./nix-build.patch ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8a5b7f2af538..457ae1cedf69 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, openssl, libtool, perl, libxml2 }: -let version = "9.10.2-P3"; in +let version = "9.10.2-P4"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0jhxbsdb8q5q0vn5aga53ixz2iy9zz8p5vwkzvngymd4vmk9l1vq"; + sha256 = "1f4w89qmsgql88nbykz82p2nwbf5m889vzlfy9bjj8gg3pn222y0"; }; patchPhase = '' diff --git a/pkgs/servers/dns/mesos-dns/default.nix b/pkgs/servers/dns/mesos-dns/default.nix deleted file mode 100644 index bf672aa89d84..000000000000 --- a/pkgs/servers/dns/mesos-dns/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "mesos-dns-${version}"; - version = "0.1"; - - goPackagePath = "github.com/mesosphere/mesos-dns"; - - src = fetchFromGitHub { - owner = "mesosphere"; - repo = "mesos-dns"; - rev = "f37051fc5a723eb021797e7d57d92755c011a28e"; - sha256 = "0djzd4zdpr4dcp56rqprncan6pcff6gy4wxi9572fmni2ldj4l15"; - }; - - # Avoid including the benchmarking test helper in the output: - subPackages = [ "." ]; - - buildInputs = with goPackages; [ go dns ]; - dontInstallSrc = true; - - meta = with lib; { - description = "DNS-based service discovery for Mesos clusters"; - homepage = https://github.com/mesosphere/mesos-dns; - license = licenses.apsl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix deleted file mode 100644 index 054c5c422e1c..000000000000 --- a/pkgs/servers/dns/skydns/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, goPackages, fetchFromGitHub, etcd }: - -with goPackages; - -buildGoPackage rec { - name = "skydns-${version}"; - version = "2.5.0a"; - - goPackagePath = "github.com/skynetservices/skydns"; - - src = fetchFromGitHub { - owner = "skynetservices"; - repo = "skydns"; - rev = version; - sha256 = "18mw8bcz54i4yrv6pc73s3ffcj1vv9cwnn76c9k0bj1mxp1pmdl2"; - }; - - buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ]; - dontInstallSrc = true; - - subPackages = [ "." ]; - - meta = with lib; { - description = "DNS service discovery for etcd"; - homepage = https://github.com/skynetservices/skydns; - license = licenses.mit; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix new file mode 100644 index 000000000000..b1714101856a --- /dev/null +++ b/pkgs/servers/dnschain/default.nix @@ -0,0 +1,11 @@ +{ stdenv, nodePackages }: + +# to update dnschain, run npm2nix package.json package.nix, and +# then add "coffee-script" manually as a dependecy for "dnschain" +# in package.nix. + +let + np = nodePackages.override { generated = ./package.nix; self = np; }; +in + +np.dnschain diff --git a/pkgs/servers/dnschain/package.json b/pkgs/servers/dnschain/package.json new file mode 100644 index 000000000000..fda40c8a90a6 --- /dev/null +++ b/pkgs/servers/dnschain/package.json @@ -0,0 +1,3 @@ +[ "dnschain" +, "coffee-script" +] diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix new file mode 100644 index 000000000000..8077cb0f01f4 --- /dev/null +++ b/pkgs/servers/dnschain/package.nix @@ -0,0 +1,2200 @@ +{ self, fetchurl, fetchgit ? null, lib }: + +{ + by-spec."accepts"."~1.2.3" = + self.by-version."accepts"."1.2.13"; + by-version."accepts"."1.2.13" = self.buildNodePackage { + name = "accepts-1.2.13"; + version = "1.2.13"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; + name = "accepts-1.2.13.tgz"; + sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; + }; + deps = { + "mime-types-2.1.6" = self.by-version."mime-types"."2.1.6"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.2.x" = + self.by-version."async"."0.2.10"; + by-version."async"."0.2.10" = self.buildNodePackage { + name = "async-0.2.10"; + version = "0.2.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.2"; + by-version."async"."0.9.2" = self.buildNodePackage { + name = "async-0.9.2"; + version = "0.9.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; + name = "async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."better-curry"."1.x.x" = + self.by-version."better-curry"."1.6.0"; + by-version."better-curry"."1.6.0" = self.buildNodePackage { + name = "better-curry-1.6.0"; + version = "1.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; + name = "better-curry-1.6.0.tgz"; + sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."binaryheap".">= 0.0.3" = + self.by-version."binaryheap"."0.0.3"; + by-version."binaryheap"."0.0.3" = self.buildNodePackage { + name = "binaryheap-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; + name = "binaryheap-0.0.3.tgz"; + sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bindings"."*" = + self.by-version."bindings"."1.2.1"; + by-version."bindings"."1.2.1" = self.buildNodePackage { + name = "bindings-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + name = "bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."2.9.9" = + self.by-version."bluebird"."2.9.9"; + by-version."bluebird"."2.9.9" = self.buildNodePackage { + name = "bluebird-2.9.9"; + version = "2.9.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; + name = "bluebird-2.9.9.tgz"; + sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bottleneck"."1.5.x" = + self.by-version."bottleneck"."1.5.3"; + by-version."bottleneck"."1.5.3" = self.buildNodePackage { + name = "bottleneck-1.5.3"; + version = "1.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; + name = "bottleneck-1.5.3.tgz"; + sha1 = "55fa64920d9670087d44150404525d59f9511c20"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."buffercursor".">= 0.0.12" = + self.by-version."buffercursor"."0.0.12"; + by-version."buffercursor"."0.0.12" = self.buildNodePackage { + name = "buffercursor-0.0.12"; + version = "0.0.12"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; + name = "buffercursor-0.0.12.tgz"; + sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; + }; + deps = { + "verror-1.6.0" = self.by-version."verror"."1.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."buffercursor".">= 0.0.5" = + self.by-version."buffercursor"."0.0.12"; + by-spec."coffee-script"."*" = + self.by-version."coffee-script"."1.10.0"; + by-version."coffee-script"."1.10.0" = self.buildNodePackage { + name = "coffee-script-1.10.0"; + version = "1.10.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; + name = "coffee-script-1.10.0.tgz"; + sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "coffee-script" = self.by-version."coffee-script"."1.10.0"; + by-spec."colors"."0.6.x" = + self.by-version."colors"."0.6.2"; + by-version."colors"."0.6.2" = self.buildNodePackage { + name = "colors-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + name = "colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."combined-stream"."~0.0.4" = + self.by-version."combined-stream"."0.0.7"; + by-version."combined-stream"."0.0.7" = self.buildNodePackage { + name = "combined-stream-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + name = "combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + deps = { + "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."component-emitter"."1.1.2" = + self.by-version."component-emitter"."1.1.2"; + by-version."component-emitter"."1.1.2" = self.buildNodePackage { + name = "component-emitter-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; + name = "component-emitter-1.1.2.tgz"; + sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = self.buildNodePackage { + name = "content-disposition-0.5.0"; + version = "0.5.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie"."0.1.2" = + self.by-version."cookie"."0.1.2"; + by-version."cookie"."0.1.2" = self.buildNodePackage { + name = "cookie-0.1.2"; + version = "0.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; + name = "cookie-0.1.2.tgz"; + sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookie-signature"."1.0.5" = + self.by-version."cookie-signature"."1.0.5"; + by-version."cookie-signature"."1.0.5" = self.buildNodePackage { + name = "cookie-signature-1.0.5"; + version = "1.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; + name = "cookie-signature-1.0.5.tgz"; + sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cookiejar"."2.0.1" = + self.by-version."cookiejar"."2.0.1"; + by-version."cookiejar"."2.0.1" = self.buildNodePackage { + name = "cookiejar-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; + name = "cookiejar-2.0.1.tgz"; + sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."core-util-is"."~1.0.0" = + self.by-version."core-util-is"."1.0.1"; + by-version."core-util-is"."1.0.1" = self.buildNodePackage { + name = "core-util-is-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"; + name = "core-util-is-1.0.1.tgz"; + sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."crc"."3.2.1" = + self.by-version."crc"."3.2.1"; + by-version."crc"."3.2.1" = self.buildNodePackage { + name = "crc-3.2.1"; + version = "3.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; + name = "crc-3.2.1.tgz"; + sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cycle"."1.0.x" = + self.by-version."cycle"."1.0.3"; + by-version."cycle"."1.0.3" = self.buildNodePackage { + name = "cycle-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + name = "cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."1.x.x" = + self.by-version."debug"."1.0.4"; + by-version."debug"."1.0.4" = self.buildNodePackage { + name = "debug-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; + name = "debug-1.0.4.tgz"; + sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; + }; + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."2" = + self.by-version."debug"."2.2.0"; + by-version."debug"."2.2.0" = self.buildNodePackage { + name = "debug-2.2.0"; + version = "2.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + name = "debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + deps = { + "ms-0.7.1" = self.by-version."ms"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."debug"."~2.1.1" = + self.by-version."debug"."2.1.3"; + by-version."debug"."2.1.3" = self.buildNodePackage { + name = "debug-2.1.3"; + version = "2.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; + name = "debug-2.1.3.tgz"; + sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; + }; + deps = { + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."delayed-stream"."0.0.5" = + self.by-version."delayed-stream"."0.0.5"; + by-version."delayed-stream"."0.0.5" = self.buildNodePackage { + name = "delayed-stream-0.0.5"; + version = "0.0.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + name = "delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = self.buildNodePackage { + name = "depd-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."destroy"."1.0.3" = + self.by-version."destroy"."1.0.3"; + by-version."destroy"."1.0.3" = self.buildNodePackage { + name = "destroy-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; + name = "destroy-1.0.3.tgz"; + sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dnschain"."*" = + self.by-version."dnschain"."0.5.3"; + by-version."dnschain"."0.5.3" = self.buildNodePackage { + name = "dnschain-0.5.3"; + version = "0.5.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/dnschain/-/dnschain-0.5.3.tgz"; + name = "dnschain-0.5.3.tgz"; + sha1 = "9b21d9ac5e203295f372ac37df470e9f0854c470"; + }; + deps = { + "bluebird-2.9.9" = self.by-version."bluebird"."2.9.9"; + "bottleneck-1.5.3" = self.by-version."bottleneck"."1.5.3"; + "event-stream-3.2.2" = self.by-version."event-stream"."3.2.2"; + "express-4.11.2" = self.by-version."express"."4.11.2"; + "hiredis-0.4.1" = self.by-version."hiredis"."0.4.1"; + "json-rpc2-0.8.1" = self.by-version."json-rpc2"."0.8.1"; + "lodash-3.1.0" = self.by-version."lodash"."3.1.0"; + "native-dns-0.6.1" = self.by-version."native-dns"."0.6.1"; + "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1"; + "nconf-0.7.1" = self.by-version."nconf"."0.7.1"; + "properties-1.2.1" = self.by-version."properties"."1.2.1"; + "redis-0.12.1" = self.by-version."redis"."0.12.1"; + "string-2.0.1" = self.by-version."string"."2.0.1"; + "winston-0.8.0" = self.by-version."winston"."0.8.0"; + "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; + "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "dnschain" = self.by-version."dnschain"."0.5.3"; + by-spec."duplexer"."~0.1.1" = + self.by-version."duplexer"."0.1.1"; + by-version."duplexer"."0.1.1" = self.buildNodePackage { + name = "duplexer-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; + name = "duplexer-0.1.1.tgz"; + sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ee-first"."1.1.0" = + self.by-version."ee-first"."1.1.0"; + by-version."ee-first"."1.1.0" = self.buildNodePackage { + name = "ee-first-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; + name = "ee-first-1.1.0.tgz"; + sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."es5class"."2.x.x" = + self.by-version."es5class"."2.3.1"; + by-version."es5class"."2.3.1" = self.buildNodePackage { + name = "es5class-2.3.1"; + version = "2.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; + name = "es5class-2.3.1.tgz"; + sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; + }; + deps = { + "better-curry-1.6.0" = self.by-version."better-curry"."1.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-html"."1.0.1" = + self.by-version."escape-html"."1.0.1"; + by-version."escape-html"."1.0.1" = self.buildNodePackage { + name = "escape-html-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; + name = "escape-html-1.0.1.tgz"; + sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."etag"."~1.5.1" = + self.by-version."etag"."1.5.1"; + by-version."etag"."1.5.1" = self.buildNodePackage { + name = "etag-1.5.1"; + version = "1.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; + name = "etag-1.5.1.tgz"; + sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; + }; + deps = { + "crc-3.2.1" = self.by-version."crc"."3.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."event-stream"."3.2.2" = + self.by-version."event-stream"."3.2.2"; + by-version."event-stream"."3.2.2" = self.buildNodePackage { + name = "event-stream-3.2.2"; + version = "3.2.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; + name = "event-stream-3.2.2.tgz"; + sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + "from-0.1.3" = self.by-version."from"."0.1.3"; + "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; + "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; + "split-0.3.3" = self.by-version."split"."0.3.3"; + "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."eventemitter3"."0.x.x" = + self.by-version."eventemitter3"."0.1.6"; + by-version."eventemitter3"."0.1.6" = self.buildNodePackage { + name = "eventemitter3-0.1.6"; + version = "0.1.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; + name = "eventemitter3-0.1.6.tgz"; + sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."express"."4.11.2" = + self.by-version."express"."4.11.2"; + by-version."express"."4.11.2" = self.buildNodePackage { + name = "express-4.11.2"; + version = "4.11.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.11.2.tgz"; + name = "express-4.11.2.tgz"; + sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; + }; + deps = { + "accepts-1.2.13" = self.by-version."accepts"."1.2.13"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "methods-1.1.1" = self.by-version."methods"."1.1.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.11.1" = self.by-version."send"."0.11.1"; + "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; + "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; + "vary-1.0.1" = self.by-version."vary"."1.0.1"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."extend"."~1.2.1" = + self.by-version."extend"."1.2.1"; + by-version."extend"."1.2.1" = self.buildNodePackage { + name = "extend-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + name = "extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."extsprintf"."1.2.0" = + self.by-version."extsprintf"."1.2.0"; + by-version."extsprintf"."1.2.0" = self.buildNodePackage { + name = "extsprintf-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz"; + name = "extsprintf-1.2.0.tgz"; + sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."eyes"."0.1.x" = + self.by-version."eyes"."0.1.8"; + by-version."eyes"."0.1.8" = self.buildNodePackage { + name = "eyes-0.1.8"; + version = "0.1.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + name = "eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."faye-websocket"."0.x.x" = + self.by-version."faye-websocket"."0.10.0"; + by-version."faye-websocket"."0.10.0" = self.buildNodePackage { + name = "faye-websocket-0.10.0"; + version = "0.10.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + name = "faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + deps = { + "websocket-driver-0.6.2" = self.by-version."websocket-driver"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."finalhandler"."0.3.3" = + self.by-version."finalhandler"."0.3.3"; + by-version."finalhandler"."0.3.3" = self.buildNodePackage { + name = "finalhandler-0.3.3"; + version = "0.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; + name = "finalhandler-0.3.3.tgz"; + sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."form-data"."0.1.3" = + self.by-version."form-data"."0.1.3"; + by-version."form-data"."0.1.3" = self.buildNodePackage { + name = "form-data-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; + name = "form-data-0.1.3.tgz"; + sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + }; + deps = { + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "async-0.9.2" = self.by-version."async"."0.9.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formidable"."1.0.14" = + self.by-version."formidable"."1.0.14"; + by-version."formidable"."1.0.14" = self.buildNodePackage { + name = "formidable-1.0.14"; + version = "1.0.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + name = "formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = self.buildNodePackage { + name = "forwarded-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fresh"."0.2.4" = + self.by-version."fresh"."0.2.4"; + by-version."fresh"."0.2.4" = self.buildNodePackage { + name = "fresh-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; + name = "fresh-0.2.4.tgz"; + sha1 = "3582499206c9723714190edd74b4604feb4a614c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."from"."~0" = + self.by-version."from"."0.1.3"; + by-version."from"."0.1.3" = self.buildNodePackage { + name = "from-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz"; + name = "from-0.1.3.tgz"; + sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."hiredis"."0.4.1" = + self.by-version."hiredis"."0.4.1"; + by-version."hiredis"."0.4.1" = self.buildNodePackage { + name = "hiredis-0.4.1"; + version = "0.4.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; + name = "hiredis-0.4.1.tgz"; + sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; + }; + deps = { + "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; + "nan-2.0.8" = self.by-version."nan"."2.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."inherits"."~2.0.1" = + self.by-version."inherits"."2.0.1"; + by-version."inherits"."2.0.1" = self.buildNodePackage { + name = "inherits-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + name = "inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ini"."1.x.x" = + self.by-version."ini"."1.3.4"; + by-version."ini"."1.3.4" = self.buildNodePackage { + name = "ini-1.3.4"; + version = "1.3.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + name = "ini-1.3.4.tgz"; + sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ipaddr.js".">= 0.1.1" = + self.by-version."ipaddr.js"."1.0.3"; + by-version."ipaddr.js"."1.0.3" = self.buildNodePackage { + name = "ipaddr.js-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.3.tgz"; + name = "ipaddr.js-1.0.3.tgz"; + sha1 = "2a9df7be73ea92aadb0d7f377497decd8e6d01bb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."isarray"."0.0.1" = + self.by-version."isarray"."0.0.1"; + by-version."isarray"."0.0.1" = self.buildNodePackage { + name = "isarray-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + name = "isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-rpc2"."0.8.1" = + self.by-version."json-rpc2"."0.8.1"; + by-version."json-rpc2"."0.8.1" = self.buildNodePackage { + name = "json-rpc2-0.8.1"; + version = "0.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; + name = "json-rpc2-0.8.1.tgz"; + sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; + }; + deps = { + "jsonparse-0.0.6" = self.by-version."jsonparse"."0.0.6"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "es5class-2.3.1" = self.by-version."es5class"."2.3.1"; + "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0"; + "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jsonparse"."0.x.x" = + self.by-version."jsonparse"."0.0.6"; + by-version."jsonparse"."0.0.6" = self.buildNodePackage { + name = "jsonparse-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; + name = "jsonparse-0.0.6.tgz"; + sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."2.x.x" = + self.by-version."lodash"."2.4.2"; + by-version."lodash"."2.4.2" = self.buildNodePackage { + name = "lodash-2.4.2"; + version = "2.4.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + name = "lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash"."3.1.0" = + self.by-version."lodash"."3.1.0"; + by-version."lodash"."3.1.0" = self.buildNodePackage { + name = "lodash-3.1.0"; + version = "3.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; + name = "lodash-3.1.0.tgz"; + sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."map-stream"."~0.1.0" = + self.by-version."map-stream"."0.1.0"; + by-version."map-stream"."0.1.0" = self.buildNodePackage { + name = "map-stream-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + name = "map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."media-typer"."0.3.0" = + self.by-version."media-typer"."0.3.0"; + by-version."media-typer"."0.3.0" = self.buildNodePackage { + name = "media-typer-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + name = "media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."merge-descriptors"."0.0.2" = + self.by-version."merge-descriptors"."0.0.2"; + by-version."merge-descriptors"."0.0.2" = self.buildNodePackage { + name = "merge-descriptors-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; + name = "merge-descriptors-0.0.2.tgz"; + sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."methods"."1.0.1" = + self.by-version."methods"."1.0.1"; + by-version."methods"."1.0.1" = self.buildNodePackage { + name = "methods-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; + name = "methods-1.0.1.tgz"; + sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."methods"."~1.1.1" = + self.by-version."methods"."1.1.1"; + by-version."methods"."1.1.1" = self.buildNodePackage { + name = "methods-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz"; + name = "methods-1.1.1.tgz"; + sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."1.2.11" = + self.by-version."mime"."1.2.11"; + by-version."mime"."1.2.11" = self.buildNodePackage { + name = "mime-1.2.11"; + version = "1.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime"."~1.2.11" = + self.by-version."mime"."1.2.11"; + by-spec."mime-db"."~1.12.0" = + self.by-version."mime-db"."1.12.0"; + by-version."mime-db"."1.12.0" = self.buildNodePackage { + name = "mime-db-1.12.0"; + version = "1.12.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; + name = "mime-db-1.12.0.tgz"; + sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.18.0" = + self.by-version."mime-db"."1.18.0"; + by-version."mime-db"."1.18.0" = self.buildNodePackage { + name = "mime-db-1.18.0"; + version = "1.18.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.18.0.tgz"; + name = "mime-db-1.18.0.tgz"; + sha1 = "5317e28224c08af1d484f60973dd386ba8f389e0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.0.9" = + self.by-version."mime-types"."2.0.14"; + by-version."mime-types"."2.0.14" = self.buildNodePackage { + name = "mime-types-2.0.14"; + version = "2.0.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; + name = "mime-types-2.0.14.tgz"; + sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; + }; + deps = { + "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-types"."~2.1.6" = + self.by-version."mime-types"."2.1.6"; + by-version."mime-types"."2.1.6" = self.buildNodePackage { + name = "mime-types-2.1.6"; + version = "2.1.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.6.tgz"; + name = "mime-types-2.1.6.tgz"; + sha1 = "949f8788411864ddc70948a0f21c43f29d25667c"; + }; + deps = { + "mime-db-1.18.0" = self.by-version."mime-db"."1.18.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.10"; + by-version."minimist"."0.0.10" = self.buildNodePackage { + name = "minimist-0.0.10"; + version = "0.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.6.2" = + self.by-version."ms"."0.6.2"; + by-version."ms"."0.6.2" = self.buildNodePackage { + name = "ms-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; + name = "ms-0.6.2.tgz"; + sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.0" = + self.by-version."ms"."0.7.0"; + by-version."ms"."0.7.0" = self.buildNodePackage { + name = "ms-0.7.0"; + version = "0.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + name = "ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ms"."0.7.1" = + self.by-version."ms"."0.7.1"; + by-version."ms"."0.7.1" = self.buildNodePackage { + name = "ms-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nan"."^2.0.5" = + self.by-version."nan"."2.0.8"; + by-version."nan"."2.0.8" = self.buildNodePackage { + name = "nan-2.0.8"; + version = "2.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nan/-/nan-2.0.8.tgz"; + name = "nan-2.0.8.tgz"; + sha1 = "c15fd99dd4cc323d1c2f94ac426313680e606392"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = + self.by-version."native-dns"."0.6.1"; + by-version."native-dns"."0.6.1" = self.buildNodePackage { + name = "native-dns-0.6.1"; + version = "0.6.1"; + bin = false; + src = fetchgit { + url = "https://github.com/okTurtles/node-dns.git"; + rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; + sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080"; + }; + deps = { + "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2"; + "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."native-dns-cache"."git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = + self.by-version."native-dns-cache"."0.0.2"; + by-version."native-dns-cache"."0.0.2" = self.buildNodePackage { + name = "native-dns-cache-0.0.2"; + version = "0.0.2"; + bin = false; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-cache.git"; + rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; + sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; + }; + deps = { + "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3"; + "native-dns-packet-0.0.3" = self.by-version."native-dns-packet"."0.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."native-dns-packet"."0.1.1" = + self.by-version."native-dns-packet"."0.1.1"; + by-version."native-dns-packet"."0.1.1" = self.buildNodePackage { + name = "native-dns-packet-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; + name = "native-dns-packet-0.1.1.tgz"; + sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; + }; + deps = { + "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; + "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = + self.by-version."native-dns-packet"."0.0.3"; + by-version."native-dns-packet"."0.0.3" = self.buildNodePackage { + name = "native-dns-packet-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-packet.git"; + rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; + sha256 = "3ab023906deb8ee86bcb34c3e67e03cebeed1ba2dcb0b1d561c362ca995b0739"; + }; + deps = { + "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; + "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = + self.by-version."native-dns-packet"."0.0.4"; + by-version."native-dns-packet"."0.0.4" = self.buildNodePackage { + name = "native-dns-packet-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchgit { + url = "https://github.com/okTurtles/native-dns-packet.git"; + rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; + sha256 = "2a5951696b4e514ab5dee36e4e5394781656a8e94c6aacba83b03f7e647f8df3"; + }; + deps = { + "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; + "ipaddr.js-1.0.3" = self.by-version."ipaddr.js"."1.0.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."nconf"."0.7.1" = + self.by-version."nconf"."0.7.1"; + by-version."nconf"."0.7.1" = self.buildNodePackage { + name = "nconf-0.7.1"; + version = "0.7.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; + name = "nconf-0.7.1.tgz"; + sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; + }; + deps = { + "async-0.9.2" = self.by-version."async"."0.9.2"; + "ini-1.3.4" = self.by-version."ini"."1.3.4"; + "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = self.buildNodePackage { + name = "negotiator-0.5.3"; + version = "0.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."on-finished"."~2.2.0" = + self.by-version."on-finished"."2.2.1"; + by-version."on-finished"."2.2.1" = self.buildNodePackage { + name = "on-finished-2.2.1"; + version = "2.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + name = "on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; + }; + deps = { + "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."~0.6.0" = + self.by-version."optimist"."0.6.1"; + by-version."optimist"."0.6.1" = self.buildNodePackage { + name = "optimist-0.6.1"; + version = "0.6.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + name = "optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."parseurl"."~1.3.0" = + self.by-version."parseurl"."1.3.0"; + by-version."parseurl"."1.3.0" = self.buildNodePackage { + name = "parseurl-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz"; + name = "parseurl-1.3.0.tgz"; + sha1 = "b58046db4223e145afa76009e61bac87cc2281b3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."path-to-regexp"."0.1.3" = + self.by-version."path-to-regexp"."0.1.3"; + by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { + name = "path-to-regexp-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + name = "path-to-regexp-0.1.3.tgz"; + sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pause-stream"."0.0.11" = + self.by-version."pause-stream"."0.0.11"; + by-version."pause-stream"."0.0.11" = self.buildNodePackage { + name = "pause-stream-0.0.11"; + version = "0.0.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + name = "pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."pkginfo"."0.3.x" = + self.by-version."pkginfo"."0.3.0"; + by-version."pkginfo"."0.3.0" = self.buildNodePackage { + name = "pkginfo-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz"; + name = "pkginfo-0.3.0.tgz"; + sha1 = "726411401039fe9b009eea86614295d5f3a54276"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."properties"."1.2.1" = + self.by-version."properties"."1.2.1"; + by-version."properties"."1.2.1" = self.buildNodePackage { + name = "properties-1.2.1"; + version = "1.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; + name = "properties-1.2.1.tgz"; + sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."proxy-addr"."~1.0.6" = + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = self.buildNodePackage { + name = "proxy-addr-1.0.8"; + version = "1.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; + }; + deps = { + "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."1.2.0" = + self.by-version."qs"."1.2.0"; + by-version."qs"."1.2.0" = self.buildNodePackage { + name = "qs-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; + name = "qs-1.2.0.tgz"; + sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."qs"."2.3.3" = + self.by-version."qs"."2.3.3"; + by-version."qs"."2.3.3" = self.buildNodePackage { + name = "qs-2.3.3"; + version = "2.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; + name = "qs-2.3.3.tgz"; + sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."range-parser"."~1.0.2" = + self.by-version."range-parser"."1.0.2"; + by-version."range-parser"."1.0.2" = self.buildNodePackage { + name = "range-parser-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz"; + name = "range-parser-1.0.2.tgz"; + sha1 = "06a12a42e5131ba8e457cd892044867f2344e549"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."readable-stream"."1.0.27-1" = + self.by-version."readable-stream"."1.0.27-1"; + by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { + name = "readable-stream-1.0.27-1"; + version = "1.0.27-1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; + name = "readable-stream-1.0.27-1.tgz"; + sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; + }; + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."redis"."0.12.x" = + self.by-version."redis"."0.12.1"; + by-version."redis"."0.12.1" = self.buildNodePackage { + name = "redis-0.12.1"; + version = "0.12.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; + name = "redis-0.12.1.tgz"; + sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."reduce-component"."1.0.1" = + self.by-version."reduce-component"."1.0.1"; + by-version."reduce-component"."1.0.1" = self.buildNodePackage { + name = "reduce-component-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; + name = "reduce-component-1.0.1.tgz"; + sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."send"."0.11.1" = + self.by-version."send"."0.11.1"; + by-version."send"."0.11.1" = self.buildNodePackage { + name = "send-0.11.1"; + version = "0.11.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.11.1.tgz"; + name = "send-0.11.1.tgz"; + sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; + }; + deps = { + "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."serve-static"."~1.8.1" = + self.by-version."serve-static"."1.8.1"; + by-version."serve-static"."1.8.1" = self.buildNodePackage { + name = "serve-static-1.8.1"; + version = "1.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; + name = "serve-static-1.8.1.tgz"; + sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; + }; + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.11.1" = self.by-version."send"."0.11.1"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."split"."0.3" = + self.by-version."split"."0.3.3"; + by-version."split"."0.3.3" = self.buildNodePackage { + name = "split-0.3.3"; + version = "0.3.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/split/-/split-0.3.3.tgz"; + name = "split-0.3.3.tgz"; + sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + }; + deps = { + "through-2.3.8" = self.by-version."through"."2.3.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stack-trace"."0.0.x" = + self.by-version."stack-trace"."0.0.9"; + by-version."stack-trace"."0.0.9" = self.buildNodePackage { + name = "stack-trace-0.0.9"; + version = "0.0.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + name = "stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."stream-combiner"."~0.0.4" = + self.by-version."stream-combiner"."0.0.4"; + by-version."stream-combiner"."0.0.4" = self.buildNodePackage { + name = "stream-combiner-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + name = "stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + deps = { + "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."string"."2.0.1" = + self.by-version."string"."2.0.1"; + by-version."string"."2.0.1" = self.buildNodePackage { + name = "string-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string/-/string-2.0.1.tgz"; + name = "string-2.0.1.tgz"; + sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."string_decoder"."~0.10.x" = + self.by-version."string_decoder"."0.10.31"; + by-version."string_decoder"."0.10.31" = self.buildNodePackage { + name = "string_decoder-0.10.31"; + version = "0.10.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + name = "string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."superagent"."0.21.0" = + self.by-version."superagent"."0.21.0"; + by-version."superagent"."0.21.0" = self.buildNodePackage { + name = "superagent-0.21.0"; + version = "0.21.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; + name = "superagent-0.21.0.tgz"; + sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; + }; + deps = { + "qs-1.2.0" = self.by-version."qs"."1.2.0"; + "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; + "methods-1.0.1" = self.by-version."methods"."1.0.1"; + "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; + "extend-1.2.1" = self.by-version."extend"."1.2.1"; + "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; + "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."2" = + self.by-version."through"."2.3.8"; + by-version."through"."2.3.8" = self.buildNodePackage { + name = "through-2.3.8"; + version = "2.3.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; + name = "through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."through"."~2.3" = + self.by-version."through"."2.3.8"; + by-spec."through"."~2.3.1" = + self.by-version."through"."2.3.8"; + by-spec."type-is"."~1.5.6" = + self.by-version."type-is"."1.5.7"; + by-version."type-is"."1.5.7" = self.buildNodePackage { + name = "type-is-1.5.7"; + version = "1.5.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; + name = "type-is-1.5.7.tgz"; + sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; + }; + deps = { + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."utils-merge"."1.0.0" = + self.by-version."utils-merge"."1.0.0"; + by-version."utils-merge"."1.0.0" = self.buildNodePackage { + name = "utils-merge-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + name = "utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."vary"."~1.0.0" = + self.by-version."vary"."1.0.1"; + by-version."vary"."1.0.1" = self.buildNodePackage { + name = "vary-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + name = "vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."verror"."^1.4.0" = + self.by-version."verror"."1.6.0"; + by-version."verror"."1.6.0" = self.buildNodePackage { + name = "verror-1.6.0"; + version = "1.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz"; + name = "verror-1.6.0.tgz"; + sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; + }; + deps = { + "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."websocket-driver".">=0.5.1" = + self.by-version."websocket-driver"."0.6.2"; + by-version."websocket-driver"."0.6.2" = self.buildNodePackage { + name = "websocket-driver-0.6.2"; + version = "0.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.2.tgz"; + name = "websocket-driver-0.6.2.tgz"; + sha1 = "8281dba3e299e5bd7a42b65d4577a8928c26f898"; + }; + deps = { + "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."websocket-extensions".">=0.1.1" = + self.by-version."websocket-extensions"."0.1.1"; + by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { + name = "websocket-extensions-0.1.1"; + version = "0.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + name = "websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."winston"."0.8.0" = + self.by-version."winston"."0.8.0"; + by-version."winston"."0.8.0" = self.buildNodePackage { + name = "winston-0.8.0"; + version = "0.8.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + name = "winston-0.8.0.tgz"; + sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.3"; + by-version."wordwrap"."0.0.3" = self.buildNodePackage { + name = "wordwrap-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + name = "wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; +} diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 990d3d52d30a..e988e8192fc6 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.9.3"; + version = "1.9.4"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1svkyrh31g9hzfmj0xwc167sz0b1fn4i62mwipdjy9ia3cscb622"; + sha256 = "1a1bixw2a4s5c3qzw3583s4a4y6i0sdzhihhlbab5rkyfh1hr6s7"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 8444d49b91e4..14f95761cfb1 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.7.10.1"; + version = "1.9.3.1"; src = fetchurl { url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz"; - sha256 = "0yg6pkagkkga6ly6fgmfcf557r2b4m75gyn6a7p9qcamb4zdgl2g"; + sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]; diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index a774777709fb..be671b7f0e7b 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap -, inotifyTools, clucene_core_2, sqlite }: +, inotify-tools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { name = "dovecot-2.2.16"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] - ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; + ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index bd179490c18b..3997370154e4 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotifyTools, openldap}: +{stdenv, fetchurl, openssl, pam, bzip2, zlib, inotify-tools, openldap}: stdenv.mkDerivation rec { name = "dovecot-2.1.17"; - buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotifyTools]; + buildInputs = [openssl bzip2 zlib openldap] ++ stdenv.lib.optionals stdenv.isLinux [pam inotify-tools]; src = fetchurl { url = "http://dovecot.org/releases/2.1/${name}.tar.gz"; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix deleted file mode 100644 index 15cdc52fb863..000000000000 --- a/pkgs/servers/monitoring/bosun/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - rev = "0.3.0"; - name = "bosun-${rev}"; - goPackagePath = "bosun.org"; - src = fetchFromGitHub { - inherit rev; - owner = "bosun-monitor"; - repo = "bosun"; - sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; - }; - subPackages = [ "cmd/bosun" ]; - - meta = with lib; { - description = "Time series alerting framework"; - longDescription = '' - An advanced, open-source monitoring and alerting system by Stack Exchange. - ''; - homepage = http://bosun.org; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix deleted file mode 100644 index d55a68ebdebe..000000000000 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - rev = "0.3.0"; - name = "scollector-${rev}"; - goPackagePath = "bosun.org"; - src = fetchFromGitHub { - inherit rev; - owner = "bosun-monitor"; - repo = "bosun"; - sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; - }; - subPackages = [ "cmd/scollector" ]; - - meta = with lib; { - description = "Collect system information and store it in OpenTSDB or Bosun"; - homepage = http://bosun.org/scollector; - license = licenses.mit; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix b/pkgs/servers/monitoring/prometheus/alertmanager/default.nix deleted file mode 100644 index f2f5eaa6f183..000000000000 --- a/pkgs/servers/monitoring/prometheus/alertmanager/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, protobuf, vim }: - -goPackages.buildGoPackage rec { - name = "prometheus-alertmanager-${rev}"; - rev = "0.0.4"; - goPackagePath = "github.com/prometheus/alertmanager"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "alertmanager"; - inherit rev; - sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15"; - }; - - buildInputs = [ - goPackages.protobuf - goPackages.fsnotify.v0 - goPackages.httprouter - goPackages.prometheus.client_golang - goPackages.prometheus.log - goPackages.pushover - protobuf - vim - ]; - - buildFlagsArray = '' - -ldflags= - -X main.buildVersion ${rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion goPackages.go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - protoc --proto_path=./config \ - --go_out=./config/generated/ \ - ./config/config.proto - cd web - ${stdenv.shell} blob/embed-static.sh static templates \ - | gofmt > blob/files.go - ) - ''; - - meta = with lib; { - description = "Alerting dispather for the Prometheus monitoring system"; - homepage = "https://github.com/prometheus/alertmanager"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/cli/default.nix b/pkgs/servers/monitoring/prometheus/cli/default.nix deleted file mode 100644 index 701ee46d4981..000000000000 --- a/pkgs/servers/monitoring/prometheus/cli/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-cli-${rev}"; - rev = "0.3.0"; - goPackagePath = "github.com/prometheus/prometheus_cli"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "prometheus_cli"; - inherit rev; - sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; - }; - - buildInputs = [ - goPackages.prometheus.client_model - goPackages.prometheus.client_golang - ]; - - meta = with lib; { - description = "Command line tool for querying the Prometheus HTTP API"; - homepage = https://github.com/prometheus/prometheus_cli; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix b/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix deleted file mode 100644 index a859c4377015..000000000000 --- a/pkgs/servers/monitoring/prometheus/collectd_exporter/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-collectd-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/collectd_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "collectd_exporter"; - inherit rev; - sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; - }; - - buildInputs = [ goPackages.prometheus.client_golang ]; - - meta = with lib; { - description = "Relay server for exporting metrics from collectd to Prometheus"; - homepage = "https://github.com/prometheus/alertmanager"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix deleted file mode 100644 index 4b8d1cdbe56b..000000000000 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, vim }: - -goPackages.buildGoPackage rec { - name = "prometheus-${version}"; - version = "0.14.0"; - goPackagePath = "github.com/prometheus/prometheus"; - rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "prometheus"; - sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9"; - }; - - buildInputs = [ - goPackages.consul - goPackages.dns - goPackages.fsnotify.v1 - goPackages.goleveldb - goPackages.logrus - goPackages.net - goPackages.prometheus.client_golang - goPackages.prometheus.log - goPackages.yaml-v2 - vim # for xxd, used in embed-static.sh - ]; - - # Metadata that gets embedded into the binary - buildFlagsArray = '' - -ldflags= - -X main.buildVersion ${version} - -X main.buildRevision ${builtins.substring 0 6 rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion goPackages.go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath/web" - ${stdenv.shell} ../utility/embed-static.sh static templates \ - | gofmt > blob/files.go - ) - ''; - - meta = with lib; { - description = "Service monitoring system and time series database"; - homepage = http://prometheus.io; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix b/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix deleted file mode 100644 index 63c421cd8a28..000000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy_exporter/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub, }: - -goPackages.buildGoPackage rec { - name = "prometheus-haproxy-exporter-0.4.0"; - goPackagePath = "github.com/prometheus/haproxy_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "haproxy_exporter"; - rev = "6ee6d1df3e68ed73df37c9794332b2594e4da45d"; - sha256 = "0lbwv6jsdfjd9ihiky3lq7d5rkxqjh7xfaziw8i3w34a38japlpr"; - }; - - buildInputs = [ goPackages.prometheus.client_golang ]; - - meta = with lib; { - description = "HAProxy Exporter for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/haproxy_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix deleted file mode 100644 index fec66af2469a..000000000000 --- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-mesos-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/mesos_exporter"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "mesos_exporter"; - sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; - }; - - buildInputs = [ - goPackages.mesos-stats - goPackages.prometheus.client_golang - goPackages.glog - ]; - - meta = with lib; { - description = "Export Mesos metrics to Prometheus"; - homepage = https://github.com/prometheus/mesos_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix deleted file mode 100644 index 0b399d0cfff5..000000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld_exporter/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-mysqld-exporter-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/mysqld_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "mysqld_exporter"; - inherit rev; - sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; - }; - - buildInputs = with goPackages; [ - mysql - prometheus.client_golang - ]; - - meta = with lib; { - description = "Prometheus exporter for MySQL server metrics"; - homepage = https://github.com/prometheus/mysqld_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix b/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix deleted file mode 100644 index b45b2784042e..000000000000 --- a/pkgs/servers/monitoring/prometheus/nginx_exporter/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-nginx-exporter-${version}"; - version = "git-2015-06-01"; - goPackagePath = "github.com/discordianfish/nginx_exporter"; - - src = fetchFromGitHub { - owner = "discordianfish"; - repo = "nginx_exporter"; - rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; - sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; - }; - - buildInputs = [ - goPackages.prometheus.client_golang - goPackages.prometheus.log - ]; - - meta = with lib; { - description = "Metrics relay from nginx stats to Prometheus"; - homepage = https://github.com/discordianfish/nginx_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix b/pkgs/servers/monitoring/prometheus/node_exporter/default.nix deleted file mode 100644 index 922c958b3f52..000000000000 --- a/pkgs/servers/monitoring/prometheus/node_exporter/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "prometheus-node-exporter-${rev}"; - rev = "0.10.0"; - goPackagePath = "github.com/prometheus/node_exporter"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "node_exporter"; - inherit rev; - sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; - }; - - buildInputs = [ - go-runit - ntp - prometheus.client_golang - prometheus.client_model - prometheus.log - protobuf - ]; - - meta = with lib; { - description = "Prometheus exporter for machine metrics"; - homepage = https://github.com/prometheus/node_exporter; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/prom2json/default.nix b/pkgs/servers/monitoring/prometheus/prom2json/default.nix deleted file mode 100644 index 368ea3ae214f..000000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ goPackages, lib, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prom2json-${rev}"; - rev = "0.1.0"; - goPackagePath = "github.com/prometheus/prom2json"; - - src = fetchFromGitHub { - owner = "prometheus"; - repo = "prom2json"; - inherit rev; - sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; - }; - - buildInputs = with goPackages; [ - golang_protobuf_extensions - prometheus.client_golang - protobuf - ]; - - meta = with lib; { - description = "A tool to scrape a Prometheus client and dump the result as JSON"; - homepage = https://github.com/prometheus/prom2json; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix b/pkgs/servers/monitoring/prometheus/pushgateway/default.nix deleted file mode 100644 index ae1e1e38902f..000000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - name = "prometheus-pushgateway-${rev}"; - rev = "0.1.1"; - goPackagePath = "github.com/prometheus/pushgateway"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "pushgateway"; - sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; - }; - - buildInputs = [ - go-bindata - protobuf - httprouter - golang_protobuf_extensions - prometheus.client_golang - ]; - - buildFlagsArray = '' - -ldflags= - -X main.buildVersion ${rev} - -X main.buildRev ${rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath" - go-bindata ./resources/ - ) - ''; - - meta = with lib; { - description = - "Allows ephemeral and batch jobs to expose metrics to Prometheus"; - homepage = https://github.com/prometheus/pushgateway; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix deleted file mode 100644 index 31acf79c8139..000000000000 --- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, lib, goPackages, fetchFromGitHub }: - -goPackages.buildGoPackage rec { - name = "prometheus-statsd-bridge-${version}"; - version = "0.1.0"; - goPackagePath = "github.com/prometheus/statsd_bridge"; - - src = fetchFromGitHub { - rev = version; - owner = "prometheus"; - repo = "statsd_bridge"; - sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; - }; - - buildInputs = with goPackages; [ - fsnotify.v0 - prometheus.client_golang - ]; - - meta = with lib; { - description = "Receives StatsD-style metrics and exports them to Prometheus"; - homepage = https://github.com/prometheus/statsd_bridge; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix index 75992ceb9ef5..1507787ae003 100644 --- a/pkgs/servers/nosql/cassandra/1.2.nix +++ b/pkgs/servers/nosql/cassandra/1.2.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix index a4aca1c55c13..d1c76c83a7ee 100644 --- a/pkgs/servers/nosql/cassandra/2.0.nix +++ b/pkgs/servers/nosql/cassandra/2.0.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index dd06d946128d..36905b5675a0 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -11,8 +11,8 @@ let - version = "2.1.8"; - sha256 = "1x92nw81pa4s95lv9qj42p05ry3ajk8klsqgc30zv7sjzm7cc31s"; + version = "2.1.9"; + sha256 = "10nwh7kx4k0kkfvl3sf22v3x58q37b81lkr6s6gvzkq67f6mjcvs"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { inherit sha256; - url = "http://apache.cs.utah.edu/cassandra/${version}/apache-${name}-bin.tar.gz"; + url = "mirror://apache/cassandra/${version}/apache-${name}-bin.tar.gz"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/influxdb/backup.nix b/pkgs/servers/nosql/influxdb/backup.nix deleted file mode 100644 index 0713f064ca58..000000000000 --- a/pkgs/servers/nosql/influxdb/backup.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, goPackages, fetchgit }: - -with goPackages; - -buildGoPackage rec { - rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596"; - name = "influxdb-backup-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/eckardt/influxdb-backup"; - src = fetchgit { - inherit rev; - url = https://github.com/eckardt/influxdb-backup.git; - sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b"; - }; - - subPackages = [ "influxdb-dump" "influxdb-restore" ]; - - buildInputs = [ eckardt.influxdb-go ]; - - meta = with lib; { - description = "Backup and Restore for InfluxDB"; - homepage = https://github.com/eckardt/influxdb-backup; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix deleted file mode 100644 index a7b77b8802a0..000000000000 --- a/pkgs/servers/nsq/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, goPackages, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.2.28"; - name = "nsq-${version}"; - goPackagePath = "github.com/bitly/nsq"; - src = fetchFromGitHub { - owner = "bitly"; - repo = "nsq"; - rev = "v${version}"; - sha256 = "0drmf1j5w3q4l6f7xjy3y7d7cl50gcx0qwci6mahxsyaaclx60yx"; - }; - - subPackages = [ "nsqadmin" ] ++ - map (x: "apps/"+x) [ "nsq_pubsub" "nsq_stat" "nsq_tail" - "nsq_to_file" "nsq_to_http" "nsq_to_nsq" - "nsqd" "nsqlookupd" ]; - - buildInputs = [ go-nsq go-options toml perks go-hostpool ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A realtime distributed messaging platform"; - homepage = http://nsq.io/; - license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch b/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch deleted file mode 100644 index d8f922aba374..000000000000 --- a/pkgs/servers/openafs-client/I5558c64760e4cad2bd3dc648067d81020afc69b6.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Thu, 25 Sep 2014 10:52:12 +0000 (-0300) -Subject: Linux 3.17: Deal with d_splice_alias errors -X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=af7f1d59135526ea584a4403b6400106dc92a992;hp=880401913d6190054bb0511093606a206b16326c - -Linux 3.17: Deal with d_splice_alias errors - -In 3.17 the logic in d_splice_alias has changed. Of interest to -us is the fact that it will now return an EIO error if it finds -an existing connected directory for the dentry, where it would -previously have added a new alias for it. As a result the end -user can get EIO errors when accessing any file in a volume -if the volume was first accessed through a different path (ex: -RO path vs RW path). - -This commit just restores the old behaviour, adding the directory -alias manually in the error case, which is what older versions -of d_splice_alias used to do. - -Change-Id: I5558c64760e4cad2bd3dc648067d81020afc69b6 ---- - -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index e03187f..0cdd9e0 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -1593,9 +1593,18 @@ afs_linux_lookup(struct inode *dip, struct dentry *dp) - /* It's ok for the file to not be found. That's noted by the caller by - * seeing that the dp->d_inode field is NULL. - */ -- if (!code || code == ENOENT) -- return newdp; -- else -+ if (!code || code == ENOENT) { -+ /* -+ * d_splice_alias can return an error (EIO) if there is an existing -+ * connected directory alias for this dentry. -+ */ -+ if (!IS_ERR(newdp)) -+ return newdp; -+ else { -+ d_add(dp, ip); -+ return NULL; -+ } -+ } else - return ERR_PTR(afs_convert_code(code)); - } - diff --git a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch b/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch deleted file mode 100644 index f8844915f85c..000000000000 --- a/pkgs/servers/openafs-client/If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 880401913d6190054bb0511093606a206b16326c Mon Sep 17 00:00:00 2001 -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Tue, 9 Sep 2014 10:39:55 -0300 -Subject: [PATCH] Linux 3.17: No more typedef for ctl_table - -The typedef has been removed so we need to use the structure -directly. - -Note that the API for register_sysctl_table has also changed -with 3.17, but it reverted back to a form that existed -before and the configure tests handle it correctly. - -Change-Id: If1fd9d27f795dee4b5aa2152dd09e0540d643a69 ---- - src/afs/LINUX/osi_sysctl.c | 4 ++-- - src/cf/linux-test4.m4 | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/afs/LINUX/osi_sysctl.c b/src/afs/LINUX/osi_sysctl.c -index a8f7fac..834e8ad 100644 ---- a/src/afs/LINUX/osi_sysctl.c -+++ b/src/afs/LINUX/osi_sysctl.c -@@ -34,7 +34,7 @@ extern afs_int32 afs_pct2; - #ifdef CONFIG_SYSCTL - static struct ctl_table_header *afs_sysctl = NULL; - --static ctl_table afs_sysctl_table[] = { -+static struct ctl_table afs_sysctl_table[] = { - { - #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) - #if defined(CTL_UNNUMBERED) -@@ -234,7 +234,7 @@ static ctl_table afs_sysctl_table[] = { - {0} - }; - --static ctl_table fs_sysctl_table[] = { -+static struct ctl_table fs_sysctl_table[] = { - { - #if defined(STRUCT_CTL_TABLE_HAS_CTL_NAME) - #if defined(CTL_UNNUMBERED) -diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4 -index dad91d9..228b491 100644 ---- a/src/cf/linux-test4.m4 -+++ b/src/cf/linux-test4.m4 -@@ -395,7 +395,7 @@ AC_DEFUN([LINUX_REGISTER_SYSCTL_TABLE_NOFLAG], [ - AC_CHECK_LINUX_BUILD([whether register_sysctl_table has an insert_at_head argument], - [ac_cv_linux_register_sysctl_table_noflag], - [#include <linux/sysctl.h>], -- [ctl_table *t; register_sysctl_table (t);], -+ [struct ctl_table *t; register_sysctl_table (t);], - [REGISTER_SYSCTL_TABLE_NOFLAG], - [define if register_sysctl_table has no insert_at head flag], - []) --- -1.7.1 diff --git a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch b/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch deleted file mode 100644 index b95cfb4c620b..000000000000 --- a/pkgs/servers/openafs-client/ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch +++ /dev/null @@ -1,51 +0,0 @@ -From e284db57f94c8f97ed1c95dcd0bd9518d86c050c Mon Sep 17 00:00:00 2001 -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Wed, 18 Jun 2014 08:53:48 -0400 -Subject: [PATCH] Linux 3.16: Switch to iter_file_splice_write - -Users of generic_file_splice_write need to switch to -using iter_file_splice_write. - -Change-Id: If4801d27e030e1cb986f483cf437a2cfa7398eb3 -Reviewed-on: http://gerrit.openafs.org/11302 -Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com> -Tested-by: Jeffrey Altman <jaltman@your-file-system.com> ---- - acinclude.m4 | 3 +++ - src/afs/LINUX/osi_vnodeops.c | 4 ++++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index ae8f1ed..9e39d90 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -958,6 +958,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) - AC_CHECK_LINUX_FUNC([inode_setattr], - [#include <linux/fs.h>], - [inode_setattr(NULL, NULL);]) -+ AC_CHECK_LINUX_FUNC([iter_file_splice_write], -+ [#include <linux/fs.h>], -+ [iter_file_splice_write(NULL,NULL,NULL,0,0);]) - AC_CHECK_LINUX_FUNC([kernel_setsockopt], - [#include <linux/net.h>], - [kernel_setsockopt(NULL, 0, 0, NULL, 0);]) -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index 6f4000b..2685915 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -827,7 +827,11 @@ struct file_operations afs_file_fops = { - .sendfile = generic_file_sendfile, - #endif - #if defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE) -+# if defined(HAVE_LINUX_ITER_FILE_SPLICE_WRITE) -+ .splice_write = iter_file_splice_write, -+# else - .splice_write = generic_file_splice_write, -+# endif - .splice_read = generic_file_splice_read, - #endif - .release = afs_linux_release, --- -1.7.1 diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 09c6468956f2..e2f01206c9bd 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -1,24 +1,14 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc, kernel, glibc, ncurses, perl, kerberos }: -assert stdenv.isLinux; -assert builtins.substring 0 4 kernel.version != "3.18"; - stdenv.mkDerivation { - name = "openafs-1.6.9-${kernel.version}"; + name = "openafs-1.6.14-${kernel.version}"; src = fetchurl { - url = http://www.openafs.org/dl/openafs/1.6.9/openafs-1.6.9-src.tar.bz2; - sha256 = "1isgw7znp10w0mr3sicnjzbc12bd1gdwfqqr667w6p3syyhs6bkv"; + url = http://www.openafs.org/dl/openafs/1.6.14/openafs-1.6.14-src.tar.bz2; + sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f"; }; - patches = [ - ./f3c0f74186f4a323ffc5f125d961fe384d396cac.patch - ./ae86b07f827d6f3e2032a412f5f6cb3951a27d2d.patch - ./I5558c64760e4cad2bd3dc648067d81020afc69b6.patch - ./If1fd9d27f795dee4b5aa2152dd09e0540d643a69.patch - ]; - buildInputs = [ autoconf automake flex yacc ncurses perl which ]; preConfigure = '' @@ -34,14 +24,14 @@ stdenv.mkDerivation { ./regen.sh - ${stdenv.lib.optionalString (kerberos != null) '' - export KRB5_CONFIG=${kerberos}/bin/krb5-config" - ''} + ${stdenv.lib.optionalString (kerberos != null) + "export KRB5_CONFIG=${kerberos}/bin/krb5-config"} configureFlagsArray=( "--with-linux-kernel-build=$TMP/linux" ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"} "--sysconfdir=/etc/static" + "--disable-linux-d_splice-alias-extra-iput" ) ''; diff --git a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch b/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch deleted file mode 100644 index e197ee4a34c8..000000000000 --- a/pkgs/servers/openafs-client/f3c0f74186f4a323ffc5f125d961fe384d396cac.patch +++ /dev/null @@ -1,130 +0,0 @@ -From: Marc Dionne <marc.dionne@your-file-system.com> -Date: Wed, 18 Jun 2014 13:06:39 +0000 (-0400) -Subject: Linux 3.16: Convert to new write_iter/read_iter ops -X-Git-Tag: openafs-stable-1_6_10pre1~76 -X-Git-Url: http://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=f3c0f74186f4a323ffc5f125d961fe384d396cac - -Linux 3.16: Convert to new write_iter/read_iter ops - -Change read/write operations to the new write_iter/read_iter -operations. - -Reviewed-on: http://gerrit.openafs.org/11303 -Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Tested-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com> -Tested-by: Jeffrey Altman <jaltman@your-file-system.com> -(cherry picked from commit a303bb257ed9e790d8c14644779e9508167887b6) - -Change-Id: I3f66104be067698a4724ed78537765cf26d4aa10 -Reviewed-on: http://gerrit.openafs.org/11309 -Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil> -Tested-by: BuildBot <buildbot@rampaginggeek.com> -Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de> ---- - -diff --git a/acinclude.m4 b/acinclude.m4 -index 83a1a8c..13d70db 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -836,6 +836,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) - AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h]) -+ AC_CHECK_LINUX_STRUCT([file_operations], [read_iter], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h]) - AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h]) - AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h]) -diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c -index 441cce7..818debe 100644 ---- a/src/afs/LINUX/osi_vnodeops.c -+++ b/src/afs/LINUX/osi_vnodeops.c -@@ -99,8 +99,11 @@ afs_linux_VerifyVCache(struct vcache *avc, cred_t **retcred) { - return afs_convert_code(code); - } - --#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ --# ifdef LINUX_HAS_NONVECTOR_AIO -+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ) -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+static ssize_t -+afs_linux_read_iter(struct kiocb *iocb, struct iov_iter *iter) -+# elif defined(LINUX_HAS_NONVECTOR_AIO) - static ssize_t - afs_linux_aio_read(struct kiocb *iocb, char __user *buf, size_t bufsize, - loff_t pos) -@@ -113,6 +116,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf, - struct file *fp = iocb->ki_filp; - ssize_t code = 0; - struct vcache *vcp = VTOAFS(fp->f_dentry->d_inode); -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ loff_t pos = iocb->ki_pos; -+ unsigned long bufsize = iter->nr_segs; -+# endif -+ - - AFS_GLOCK(); - afs_Trace4(afs_iclSetp, CM_TRACE_AIOREADOP, ICL_TYPE_POINTER, vcp, -@@ -125,7 +133,11 @@ afs_linux_aio_read(struct kiocb *iocb, const struct iovec *buf, - * so we optimise by not using it */ - osi_FlushPages(vcp, NULL); /* ensure stale pages are gone */ - AFS_GUNLOCK(); -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ code = generic_file_read_iter(iocb, iter); -+# else - code = generic_file_aio_read(iocb, buf, bufsize, pos); -+# endif - AFS_GLOCK(); - } - -@@ -170,8 +182,11 @@ afs_linux_read(struct file *fp, char *buf, size_t count, loff_t * offp) - * also take care of re-positioning the pointer if file is open in append - * mode. Call fake open/close to ensure we do writes of core dumps. - */ --#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ --# ifdef LINUX_HAS_NONVECTOR_AIO -+#if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) || defined(HAVE_LINUX_GENERIC_FILE_AIO_READ) -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+static ssize_t -+afs_linux_write_iter(struct kiocb *iocb, struct iov_iter *iter) -+# elif defined(LINUX_HAS_NONVECTOR_AIO) - static ssize_t - afs_linux_aio_write(struct kiocb *iocb, const char __user *buf, size_t bufsize, - loff_t pos) -@@ -184,6 +199,10 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf, - ssize_t code = 0; - struct vcache *vcp = VTOAFS(iocb->ki_filp->f_dentry->d_inode); - cred_t *credp; -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ loff_t pos = iocb->ki_pos; -+ unsigned long bufsize = iter->nr_segs; -+# endif - - AFS_GLOCK(); - -@@ -199,7 +218,11 @@ afs_linux_aio_write(struct kiocb *iocb, const struct iovec *buf, - ReleaseWriteLock(&vcp->lock); - if (code == 0) { - AFS_GUNLOCK(); -+# if defined(STRUCT_FILE_OPERATIONS_HAS_READ_ITER) -+ code = generic_file_write_iter(iocb, iter); -+# else - code = generic_file_aio_write(iocb, buf, bufsize, pos); -+# endif - AFS_GLOCK(); - } - -@@ -788,7 +811,12 @@ struct file_operations afs_dir_fops = { - }; - - struct file_operations afs_file_fops = { --#ifdef HAVE_LINUX_GENERIC_FILE_AIO_READ -+#ifdef STRUCT_FILE_OPERATIONS_HAS_READ_ITER -+ .read_iter = afs_linux_read_iter, -+ .write_iter = afs_linux_write_iter, -+ .read = new_sync_read, -+ .write = new_sync_write, -+#elif defined(HAVE_LINUX_GENERIC_FILE_AIO_READ) - .aio_read = afs_linux_aio_read, - .aio_write = afs_linux_aio_write, - .read = do_sync_read, diff --git a/pkgs/servers/serfdom/default.nix b/pkgs/servers/serfdom/default.nix deleted file mode 100644 index 94a46459d4e4..000000000000 --- a/pkgs/servers/serfdom/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.6.4"; - name = "serfdom-${version}"; - goPackagePath = "github.com/hashicorp/serf"; - - src = fetchFromGitHub { - owner = "hashicorp"; - repo = "serf"; - rev = "v${version}"; - sha256 = "1fhz8wrvsmgaky22n255w9hkyfph2n45c47ivdyzrrxisg5j2438"; - }; - - buildInputs = [ cli mapstructure memberlist_v2 logutils go-syslog mdns columnize circbuf ugorji.go ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A service discovery and orchestration tool that is decentralized, highly available, and fault tolerant"; - homepage = http://www.serfdom.io/; - license = licenses.mpl20; - maintainers = with maintainers; [ msackman cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/servers/x11/xorg/fix_segfault.patch b/pkgs/servers/x11/xorg/fix_segfault.patch new file mode 100644 index 000000000000..b3a7d2ed5e00 --- /dev/null +++ b/pkgs/servers/x11/xorg/fix_segfault.patch @@ -0,0 +1,63 @@ +From 7cc7ffd25d5e50b54cb942d07d4cb160f20ff9c5 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.peres@linux.intel.com> +Date: Fri, 17 Jul 2015 17:21:26 +0300 +Subject: [PATCH] os: make sure the clientsWritable fd_set is initialized + before use + +In WaitForSomething(), the fd_set clientsWritable may be used unitialized when +the boolean AnyClientsWriteBlocked is set in the WakeupHandler(). This leads to +a crash in FlushAllOutput() after x11proto's commit +2c94cdb453bc641246cc8b9a876da9799bee1ce7. + +The problem did not manifest before because both the XFD_SIZE and the maximum +number of clients were set to 256. As the connectionTranslation table was +initalized for the 256 clients to 0, the test on the index not being 0 was +aborting before dereferencing the client #0. + +As of commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7 in x11proto, the XFD_SIZE +got bumped to 512. This lead the OutputPending fd_set to have any fd above 256 +to be uninitialized which in turns lead to reading an index after the end of +the ConnectionTranslation table. This index would then be used to find the +client corresponding to the fd marked as pending writes and would also result +to an out-of-bound access which would usually be the fatal one. + +Fix this by zeroing the clientsWritable fd_set at the beginning of +WaitForSomething(). In this case, the bottom part of the loop, which would +indirectly call FlushAllOutput, will not do any work but the next call to +select will result in the execution of the right codepath. This is exactly what +we want because we need to know the writable clients before handling them. In +the end, it also makes sure that the fds above MaxClient are initialized, +preventing the crash in FlushAllOutput(). + +Thanks to everyone involved in tracking this one down! + +Reported-by: Karol Herbst <freedesktop@karolherbst.de> +Reported-by: Tobias Klausmann <tobias.klausmann@mni.thm.de> +Signed-off-by: Martin Peres <martin.peres@linux.intel.com> +Tested-by: Martin Peres <martin.peres@linux.intel.com> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91316 +Cc: Ilia Mirkin <imirkin@alum.mit.edu> +Cc: Martin Peres <martin.peres@linux.intel.com> +Cc: Olivier Fourdan <ofourdan@redhat.com +Cc: Adam Jackson <ajax@redhat.com> +Cc: Alan Coopersmith <alan.coopersmith@oracle.com +Cc: Chris Wilson <chris@chris-wilson.co.uk> +--- + os/WaitFor.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/os/WaitFor.c b/os/WaitFor.c +index 431f1a6..993c14e 100644 +--- a/os/WaitFor.c ++++ b/os/WaitFor.c +@@ -158,6 +158,7 @@ WaitForSomething(int *pClientsReady) + Bool someReady = FALSE; + + FD_ZERO(&clientsReadable); ++ FD_ZERO(&clientsWritable); + + if (nready) + SmartScheduleStopTimer(); +-- +2.4.5 + diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 71185643a9e6..c1a8fec596f3 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -282,7 +282,8 @@ in inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; - commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; + # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 + commonPatches = [ ./xorgserver-xkbcomp-path.patch ./fix_segfault.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. darwinOtherX = overrideDerivation xorgserver (oldAttrs: { @@ -421,4 +422,8 @@ in outputs = [ "out" "doc" ]; }; + xrdb = attrs: attrs // { + configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp"; + }; + } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index b755d28c8511..41d00048a924 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.0.8"; + version = "5.1"; documentation = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "0h4y6f0fjb1lf83j4cixl0h5jgyy5q7y1iw7w33flp7s8y60ir8f"; + url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.gz"; + sha256 = "0xkw2dd81kcz7ci5y6w7gg3lxpqk3l2mnv0kv8ldp6dnqmmx2rap"; }; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { name = "zsh-${version}"; src = fetchurl { - url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "08vxw74v8cx6hcynz0cdf7s2z5p6nqmxfsxmhhpz5vwbrc4cyyc0"; + url = "mirror://sourceforge/zsh/zsh-${version}.tar.gz"; + sha256 = "16fdvvin128kajgp137k3zx4p4xha6zaipyfanwhys8fh60i6wz3"; }; buildInputs = [ ncurses coreutils pcre ]; @@ -25,6 +25,10 @@ stdenv.mkDerivation { configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre" ''; + # Some tests fail on hydra, see + # http://hydra.nixos.org/build/25637689/nixlog/1 + doCheck = false; + # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' mkdir -p $out/share/ diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fe7bec54ba02..249e4845bc28 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -27,7 +27,7 @@ let lib.lists.all (license: let l = lib.licenses.${license.shortName or "BROKEN"} or false; in if license == l then true else - throw ''‘${builtins.toJSON license}’ is not an attribute of lib.licenses'' + throw ''‘${showLicense license}’ is not an attribute of lib.licenses'' ) list; mutuallyExclusive = a: b: @@ -73,6 +73,8 @@ let isUnfree (lib.lists.toList attrs.meta.license) && !allowUnfreePredicate attrs; + showLicense = license: license.shortName or "unknown"; + defaultNativeBuildInputs = extraBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh ../../build-support/setup-hooks/compress-man-pages.sh @@ -121,9 +123,9 @@ let licenseAllowed = attrs: if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then - throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted" + throwEvalHelp "Unfree" "has an unfree license (‘${showLicense attrs.meta.license}’)" else if hasBlacklistedLicense attrs then - throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted" + throwEvalHelp "blacklisted" "has a blacklisted license (‘${showLicense attrs.meta.license}’)" else if !allowBroken && attrs.meta.broken or false then throwEvalHelp "Broken" "is marked as broken" else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then diff --git a/pkgs/tools/X11/bgs/default.nix b/pkgs/tools/X11/bgs/default.nix index c305583a3f9f..488c97ad36b5 100644 --- a/pkgs/tools/X11/bgs/default.nix +++ b/pkgs/tools/X11/bgs/default.nix @@ -1,15 +1,17 @@ -{stdenv, fetchurl, libX11, libXinerama, imlib2}: +{stdenv, fetchurl, pkgconfig, libX11, libXinerama, imlib2}: stdenv.mkDerivation rec { name = "bgs-${version}"; - version = "0.7.1"; + version = "0.8"; src = fetchurl { url = "https://github.com/Gottox/bgs/archive/v${version}.tar.gz"; - sha256 = "1kgm139daz4xrymx11whbmwzsnps9yn4g34a17s34ihi0raf70w8"; + sha256 = "1rw9ingkkpvvr2dixx126ziim67a54r8k49918h1mbph0fjj08n5"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXinerama imlib2 ]; preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk''; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f544b81e78d5..06c9b85b8d6a 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchzip, pythonPackages, groff }: +{ stdenv, fetchFromGitHub, pythonPackages, groff }: pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.7.41"; + version = "1.7.47"; namePrefix = ""; - src = fetchzip { - url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; - sha256 = "1xfvpqyxi5qaqcvm56q616k9zjidbc9l2vk1v3ld6lnlzri3a1ra"; + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-cli"; + rev = version; + sha256 = "1955y1ar2mqzqgfngpwp8pc78wphh1qdgwwy0gs6i352jaqzkvwi"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 342c975fa1f5..cd151698f250 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fuse, perl }: +{ stdenv, fetchurl, pkgconfig, fuse, perl, gcc48 }: stdenv.mkDerivation rec { name = "cromfs-1.5.10.2"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install util/unmkcromfs $out/bin ''; - buildInputs = [ pkgconfig fuse perl ]; + buildInputs = [ pkgconfig fuse perl gcc48 ]; meta = { description = "FUSE Compressed ROM filesystem with lzma"; diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0af0b427bf23..8c693d9145fb 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -44,7 +44,7 @@ let pluginsWithoutDeps = [ "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate" - "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics" + "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" "mbcollection" "mbsync" "metasync" "missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" @@ -60,14 +60,14 @@ let in buildPythonPackage rec { name = "beets-${version}"; - version = "1.3.13"; + version = "1.3.14"; namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; repo = "beets"; rev = "v${version}"; - sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl"; + sha256 = "0bha101x1wdrl2hj31fhixm3hp7ahdm2064b9k5gg0ywm651128g"; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix index e2857eed7d86..f2ae4e83ad1a 100644 --- a/pkgs/tools/backup/tarsnap/default.nix +++ b/pkgs/tools/backup/tarsnap/default.nix @@ -1,11 +1,6 @@ { stdenv, fetchurl, openssl, zlib, e2fsprogs }: let - bashCompletion = fetchurl { - url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash"; - sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405"; - }; - zshCompletion = fetchurl { url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh"; sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair"; @@ -13,18 +8,25 @@ let in stdenv.mkDerivation rec { name = "tarsnap-${version}"; - version = "1.0.35"; + version = "1.0.36.1"; src = fetchurl { - url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; - sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; + url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz"; + sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452"; }; + preConfigure = '' + configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d" + ''; + + patchPhase = '' + substituteInPlace Makefile.in \ + --replace "command -p mv" "mv" + ''; + postInstall = '' # Install some handy-dandy shell completions - mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions - cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash - cp ${zshCompletion} $out/share/zsh/site-functions/_tarsnap + install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap ''; buildInputs = [ openssl zlib e2fsprogs ]; diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix deleted file mode 100644 index fcf57526fd1c..000000000000 --- a/pkgs/tools/filesystems/ceph/0.94-pre.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, fetchgit, ... } @ args: - -callPackage ./generic.nix (args // rec { - version = "0.94.3"; - - src = fetchgit { - url = "https://github.com/wkennington/ceph.git"; - rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec"; - sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr"; - }; - - patches = [ ./fix-pgrefdebugging.patch ]; -}) diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix index 4dca90e5f273..f564e28c5a3b 100644 --- a/pkgs/tools/filesystems/ceph/0.94.nix +++ b/pkgs/tools/filesystems/ceph/0.94.nix @@ -1,16 +1,13 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "0.94.2"; + version = "0.94.3"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l"; + sha256 = "020khb9978wayi4jnx7f9g1fzfg3r2xn9qw66snpd3k8w2dmycxy"; }; - patches = [ - ./fix-pgrefdebugging.patch - ./boost-158.patch - ]; + patches = [ ./fix-pgrefdebugging.patch ]; }) diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix index 5cc183d1053c..2d0a1a633063 100644 --- a/pkgs/tools/filesystems/ceph/dev.nix +++ b/pkgs/tools/filesystems/ceph/dev.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "9.0.2"; + version = "9.0.3"; src = fetchgit { url = "https://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "0kydjyvb1566mh33p6dlljfx1r4cfdj8ic4i19h5r9vavkc46nf0"; + sha256 = "08ccy735srzmi505qlrpqdh5js40mpd5k1vdhnysknra0vqlpmdx"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 77d24766f133..d63937f7fbf2 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -76,7 +76,7 @@ let hasRadosgw = optFcgi != null && optExpat != null && optCurl != null && optLibedit != null; hasXio = (stdenv.isLinux || stdenv.isFreeBSD) && - versionAtLeast version "10.0.0" && + versionAtLeast version "9.0.3" && optAccelio != null && optLibibverbs != null && optLibrdmacm != null; hasRocksdb = versionAtLeast version "9.0.0" && optRocksdb != null; diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index 77d0352f670d..a36e29c6f087 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-08-18"; + version = "2015-09-04"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f"; - sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v"; + rev = "8c17e0197481205f8726b06d57313ffe08fba2bf"; + sha256 = "189l412m6x0f0mqzhgzwfa3sgm5xfxzb9synlvbfm3n1fgdhj5iy"; }; patches = [ ./fix-pythonpath.patch ]; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix new file mode 100644 index 000000000000..161425ad137b --- /dev/null +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, fuse, zlib, glib }: + +stdenv.mkDerivation rec { + name = "fuseiso-20070708"; + + src = fetchurl { + url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692"; + }; + + buildInputs = [ pkgconfig fuse zlib glib ]; + + meta = { + homepage = http://sourceforge.net/projects/fuseiso; + description = "FUSE module to mount ISO filesystem images"; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix deleted file mode 100644 index cf521425a76d..000000000000 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, goPackages, pkgconfig, libmtp, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "9c2b46050e8ea8574eaec2124867ac7b11e6471d"; - name = "go-mtpfs-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hanwen/go-mtpfs"; - src = fetchFromGitHub { - inherit rev; - owner = "hanwen"; - repo = "go-mtpfs"; - sha256 = "0kxi18cb078q4wikfajp3yvp802wzfsfdp431j0dg2jdw8y7gfii"; - }; - - buildInputs = [ go-fuse libmtp usb ]; - - subPackages = [ "./" ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A simple FUSE filesystem for mounting Android devices as a MTP device"; - homepage = https://github.com/hanwen/go-mtpfs; - maintainers = with maintainers; [ bennofs ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 7dfbbf66c0aa..662ceba03b89 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.0.9"; in +let version = "1.1.0"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "0d6djyd7wjvzbqj738b2z4jr5c2s30g8q8xygipyi0007g42gc7z"; + sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index a64b7f550033..97d70d1a45b9 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -6,18 +6,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc}/lib64"; - sha256 = "061kl186vllqhl1443d9cwvp4qdhqc42yf3x72a1w0bjvn0i3z1i"; + sha256 = "08mmjz061b0hrqp8zg31w089n5bk3sq4r3w84zr33d8pnvkgq2wk"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc}/lib"; - sha256 = "1l9mxlin41w83dn70cvdk1n1vn1dll3d8r120jkqn5jfhicrgvv3"; + sha256 = "1zb6cnldd43nr4k2qg9hnrkgj0iik2gpxqrjypbhwv75hnvjma93"; }; in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.870"; + version = "0.1.5.905"; src = fetchurl { url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://help.yandex.com/disk/cli-clients.xml; description = "A free cloud file storage service"; - maintainers = with stdenv.lib.maintainers; [smironov]; + maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; longDescription = '' diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix index 1b0201c4b179..0b2382315a5d 100644 --- a/pkgs/tools/inputmethods/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; - version = "1.5.6"; + version = "1.5.7"; meta = with stdenv.lib; { description = "IBus interface to the anthy input method"; @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner ]; }; + configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; + buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ]; postFixup = '' + substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out for file in "$out"/libexec/*; do wrapProgram "$file" \ --prefix PYTHONPATH : $PYTHONPATH \ @@ -24,6 +27,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; - sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03"; + sha256 = "00sjrfhghrgkqm72mf39f8sz6wr4fwvvs9mn2alaldhgr5v0c861"; }; } diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix deleted file mode 100644 index 626fb5c2321e..000000000000 --- a/pkgs/tools/misc/asciinema/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchFromGitHub, goPackages }: - -goPackages.buildGoPackage rec { - name = "asciinema-${version}"; - version = "1.1.1"; - - goPackagePath = "github.com/asciinema/asciinema"; - - src = fetchFromGitHub { - owner = "asciinema"; - repo = "asciinema"; - rev = "d6f7cabcd085e237872f13d0ab5580964cb64fb2"; - sha256 = "0ip7wcqzf5wax99c1fjmnwd38q88z1xiyv9cfbjyk47npdqb8173"; - }; - - meta = { - homepage = https://asciinema.org/; - license = stdenv.lib.licenses.gpl3; - description = "Terminal session recorder"; - maintainers = with stdenv.lib.maintainers; [ lassulus ]; - }; -} diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix new file mode 100644 index 000000000000..342c014faaae --- /dev/null +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, perl, dpkg }: + +stdenv.mkDerivation rec { + name = "bdf2psf-${version}"; + version = "1.132"; + + src = fetchurl { + url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; + sha256 = "01r8v6qi6klsgi66ld86c78cdz308mywrm9j101d73nsxgx6qhzz"; + }; + + buildInputs = [ dpkg ]; + + dontConfigure = true; + dontBuild = true; + + unpackPhase = "dpkg-deb -x $src ."; + installPhase = " + substituteInPlace usr/bin/bdf2psf --replace /usr/bin/perl ${perl}/bin/perl + mv usr/bin . + cp -r . $out + "; + + meta = { + description = "BDF to PSF converter"; + homepage = https://packages.debian.org/sid/bdf2psf; + longDescription = '' + Font converter to generate console fonts from BDF source fonts + ''; + license = stdenv.lib.licenses.gpl2; + }; +} \ No newline at end of file diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index f8925d26beac..b6158ab64454 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,30 +1,50 @@ {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper -, perlPackages +, perlPackages, curl, gnupg, diffutils +, sendmailPath ? "/var/setuid-wrappers/sendmail" }: + stdenv.mkDerivation rec { - version = "2.15.4"; + version = "2.15.8"; name = "debian-devscripts-${version}"; + src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72"; + sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx"; }; + buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile FileDesktopEntry libxslt python3 setuptools makeWrapper - perlPackages.ParseDebControl ]; + perlPackages.ParseDebControl perlPackages.LWPProtocolHttps + curl gnupg diffutils ]; + preConfigure = '' export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; - sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile - sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile tgtpy="$out/lib/${python3.libPrefix}/site-packages" mkdir -p "$tgtpy" export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" - sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile* - sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile* - - # Completion currently spams every shell startup with an error. Disable for now: - sed "/\/bash_completion\.d/d" -i scripts/Makefile + find po4a scripts -type f -exec sed -r \ + -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \ + -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \ + -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \ + -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \ + -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \ + -i {} + + sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile + sed -r \ + -e "s@/usr( |$|/)@$out\\1@g" \ + -e "s@/etc( |$|/)@$out/etc\\1@g" \ + -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \ + -i Makefile* */Makefile* ''; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + "COMPL_DIR=/share/bash-completion/completions" + "PERLMOD_DIR=/share/devscripts" + ]; + postInstall = '' sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/* for i in "$out/bin"/*; do @@ -34,9 +54,10 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/python3.4/site-packages" done ''; - meta = { + + meta = with stdenv.lib; { description = ''Debian package maintenance scripts''; - license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with maintainers; [raskin]; }; } diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index c91d418d870e..a50717d53992 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, tcl, makeWrapper }: -let version = "5.45"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "5.45"; name = "expect-${version}"; src = fetchurl { @@ -27,7 +26,8 @@ stdenv.mkDerivation { for i in $out/bin/*; do wrapProgram $i \ --prefix PATH : "${tcl}/bin" \ - --prefix TCLLIBPATH ' ' $out/lib/* + --prefix TCLLIBPATH ' ' $out/lib/* \ + ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} done ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; license = "Expect"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix deleted file mode 100644 index 5692fc25a326..000000000000 --- a/pkgs/tools/misc/fzf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchFromGitHub, goPackages, syncthing, ncurses }: - -with goPackages; - -buildGoPackage rec { - name = "fzf-${version}"; - version = "0.10.0"; - goPackagePath = "github.com/junegunn/fzf"; - src = fetchFromGitHub { - owner = "junegunn"; - repo = "fzf"; - rev = "${version}"; - sha256 = "0dx9qwmcrnh31m2n75qmpj1dxm6rr6xsbazy4nwa3bzrb8y6svh2"; - }; - - buildInputs = with goPackages; [ - crypto - ginkgo - gomega - junegunn.go-runewidth - go-shellwords - ncurses - syncthing - text - ]; - - meta = with stdenv.lib; { - homepage = https://github.com/junegunn/fzf; - description = "A command-line fuzzy finder written in Go"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - }; -} diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 081868589bc7..ab02c7dc3d1d 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -15,20 +15,17 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/vendor - mkdir -p $out/lib - cp -a bin $out - cp -a vendor $out - cp -a lib $out - cp Gemfile* $out + mkdir -p $out + cp -r {Gemfile*,vendor,lib} $out + cp bin/logstash $out/logstash + cp bin/plugin $out/logstash-plugin ''; - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - homepage = http://www.elasticsearch.org; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.wjlroe ]; + meta = with stdenv.lib; { + description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems."; + homepage = https://www.elastic.co/products/logstash; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.wjlroe maintainers.offline ]; }; } diff --git a/pkgs/tools/misc/ngrok/default.nix b/pkgs/tools/misc/ngrok/default.nix deleted file mode 100644 index c3019d722afd..000000000000 --- a/pkgs/tools/misc/ngrok/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, git, fetchFromGitHub, goPackages }: - -with goPackages; - -buildGoPackage rec { - name = "ngrok-1.7"; - goPackagePath = "ngrok"; - - src = fetchFromGitHub { - rev = "b7d5571aa7f12ac304b8f8286b855cc64dd9bab8"; - owner = "inconshreveable"; - repo = "ngrok"; - sha256 = "0a5iq9l9f2xdg6gnc9pj0iczhycv1w5iwcqgzzap83xfpy01xkh4"; - }; - - subPackages = [ "main/ngrok" "main/ngrokd" ]; - - preConfigure = '' - sed -e '/jteeuwen\/go-bindata/d' \ - -e '/export GOPATH/d' \ - -e 's/go get/#go get/' \ - -e 's|bin/go-bindata|go-bindata|' -i Makefile - make assets BUILDTAGS=release - export sourceRoot=$sourceRoot/src/ngrok - ''; - - buildInputs = [ git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics - yaml-v1 go-bindata go-update binarydist osext ]; - - buildFlags = "-tags release"; - - dontInstallSrc = true; - - meta = with stdenv.lib; { - description = "Reverse proxy that creates a secure tunnel between from a public endpoint t -o a locally running web service"; - homepage = https://ngrok.com/; - license = licenses.asl20; - maintainers = with maintainers; [ iElectric cstrahan ]; - platforms = with platforms; linux ++ darwin; - }; - -} diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4a3b90f56d8f..d96ca1080d83 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { name = "parallel-20150822"; @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d"; }; - patchPhase = '' - sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' - ''; + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* - # The `sem' program wants to write to `~/.parallel'. - preBuild = '' - export HOME="$PWD" + wrapProgram $out/bin/parallel \ + --prefix PATH : "${procps}/bin" \ + --prefix PATH : "${perl}/bin" \ ''; doCheck = true; diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/progress/default.nix index a92bfcdb35d3..cf70b234b88a 100644 --- a/pkgs/tools/misc/cv/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "cv-${version}"; - version = "0.8"; + name = "progress-${version}"; + version = "0.9"; src = fetchFromGitHub { owner = "Xfennec"; - repo = "cv"; + repo = "progress"; rev = "v${version}"; - sha256 = "17vfcv0n1ib4rh1hdl126aid7cnnk94avzlk9yp7y855iml8xzs4"; + sha256 = "07bl5fsr538nk4l8vwj1kf5bivlh3a8cy8jliqfadxmhf1knn2mw"; }; buildInputs = [ ncurses ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/Xfennec/cv; + homepage = https://github.com/Xfennec/progress; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 574178222c6f..11d6991b89cb 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.14"; + name = "remind-3.1.15"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz; - sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a"; + url = http://www.roaringpenguin.com/files/download/remind-03.01.15.tar.gz; + sha256 = "1hcfcxz5fjzl7606prlb7dgls5kr8z3wb51h48s6qm8ang0b9nla"; }; meta = { diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix new file mode 100644 index 000000000000..5fbb39431155 --- /dev/null +++ b/pkgs/tools/misc/tmate/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoconf, automake110x, libtool, pkgconfig, zlib, openssl, libevent, ncurses, cmake, ruby }: + +stdenv.mkDerivation rec { + name = "tmate-${version}"; + version = "1.8.10"; + + src = fetchFromGitHub { + owner = "nviennot"; + repo = "tmate"; + rev = version; + sha256 = "1bd9mi8fx40608zlady9dbv21kbdwc3kqrgz012m529f6cbysmzc"; + }; + + buildInputs = [ autoconf automake110x pkgconfig libtool zlib openssl libevent ncurses cmake ruby ]; + + dontUseCmakeConfigure=true; + + preConfigure = "./autogen.sh"; + + meta = { + homepage = http://tmate.io/; + description = "Instant Terminal Sharing"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ DamienCassou ]; + }; +} diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 04f3a31aa48a..cc51af22f851 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { major = "13"; - minor = "2"; + minor = "3"; version = "${major}.${minor}"; name = "umlet-${version}"; src = fetchurl { url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip"; - sha256 = "19jngb2sr212lh3yi43bqq2skhd9cxa8yfbfc3i6fbm2v0b7i2xf"; + sha256 = "0fbr51xknk98qz576lcl25qz0s1snns2yb0j54d77xkw7pnxmvzr"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix new file mode 100644 index 000000000000..589f7d9a94b7 --- /dev/null +++ b/pkgs/tools/misc/urjtag/default.nix @@ -0,0 +1,38 @@ +{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison +, flex, fetchgit, makeWrapper +, jedecSupport ? false +, pythonBindings ? false +, python3 ? null +}: + +stdenv.mkDerivation rec { + version = "0.10"; + name = "urjtag-${version}"; + + src = fetchgit { + url = "git://git.code.sf.net/p/urjtag/git"; + rev = "7ba12da7845af7601e014a2a107670edc5d6997d"; + sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a"; + }; + + buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ] + ++ stdenv.lib.optional pythonBindings python3; + + configureFlags = '' + --prefix=/ + ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"} + ${if pythonBindings then "--enable-python" else "--disable-python"} + ''; + preConfigure = "cd urjtag; ./autogen.sh"; + + makeFlags = [ "DESTDIR=$(out)" ]; + + meta = { + description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; + homepage = "http://urjtag.org/"; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ]; + platforms = stdenv.lib.platforms.gnu; # arbitrary choice + maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + }; +} + diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 16a54c819464..33c9489a70d0 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -1,52 +1,27 @@ -x@{builderDefsPackage - , libX11, xproto, libXt, libICE - , libSM, libXext - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="xdaliclock"; - version = "2.43"; - name="${baseName}-${version}"; - project="${baseName}"; - url="http://www.jwz.org/${project}/${name}.tar.gz"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; +stdenv.mkDerivation rec { + name = "xdaliclock-${version}"; + version = "2.43"; + + src = fetchurl { + url="http://www.jwz.org/xdaliclock/${name}.tar.gz"; sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb"; }; - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"]; + sourceRoot = "${name}/X11"; - prepareDirs = a.fullDepEntry '' - mkdir -p "$out/bin" "$out/share" "$out/share/man/man1" - '' ["minInit" "defEnsureDir"]; + buildInputs = [ libX11 xproto libXt libICE libSM libXext ]; - goSrcDir = "cd X11"; + preInstall = '' + mkdir -vp $out/bin $out/share/man/man1 + ''; - meta = { + meta = with stdenv.lib; { description = "A clock application that morphs digits when they are changed"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux ++ freebsd; - license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT - downloadPage = "http://www.jwz.org/xdaliclock/"; - inherit version; - updateWalker = true; + maintainers = with maintainers; [ raskin rycee ]; + platforms = with platforms; linux ++ freebsd; + license = licenses.free; #TODO BSD on Gentoo, looks like MIT + downloadPage = http://www.jwz.org/xdaliclock/; }; -}) x +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index de9d918deeb4..e9f7eadc9146 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { name = "youtube-dl-${version}"; - version = "2015.08.16.1"; + version = "2015.08.28"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy"; + sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp"; }; buildInputs = [ makeWrapper zip pandoc ]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 25e4a2cb3adf..75e4155c61d1 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.28"; + version = "1.30"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; rev = "refs/tags/${version}"; - sha256 = "13c374bfj7dzlx7zvnnigmk0ck5cy601aqi18n77mcrq9yyxw5y9"; + sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295"; }; buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index d9310e2372eb..dfe2de9b96d3 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.9.2"; + name = "dhcpcd-6.9.3"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "0w4aqpn6wczvrffc51lq87acvqwqdskk7948z3sz9laslci29y79"; + sha256 = "0lxfis066ijjlqha2mf49v8mydmnnjb6nijihfn65ylmsqg4g2b0"; }; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix deleted file mode 100644 index 3c439541e915..000000000000 --- a/pkgs/tools/networking/flannel/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - version = "0.1.0"; - name = "flannel-${version}"; - goPackagePath = "github.com/coreos/flannel"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "flannel"; - rev = "v${version}"; - sha256 = "1f7x6a2c8ix6j5y1r0dq56b58bl2rs2ycbdqb9fz5zv1zk2w20rd"; - }; - - dontInstallSrc = true; - - meta = with lib; { - description = "Flannel is an etcd backed network fabric for containers"; - homepage = https://github.com/coreos/flannel; - license = licenses.asl20; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/networking/fuppes/default.nix b/pkgs/tools/networking/fuppes/default.nix index 711c3516bda2..67e3b581f24f 100644 --- a/pkgs/tools/networking/fuppes/default.nix +++ b/pkgs/tools/networking/fuppes/default.nix @@ -50,5 +50,7 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.pierron ]; platforms = stdenv.lib.platforms.all; + + broken = true; }; } diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index 1418ad63385c..418f8647f8c2 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -1,24 +1,30 @@ -{stdenv, fetchurl, perl, openssl, MailIMAPClient}: +{stdenv, makeWrapper, fetchurl, perl, openssl, perlPackages }: stdenv.mkDerivation rec { - name = "imapsync-1.267"; + name = "imapsync-1.607"; src = fetchurl { - url = http://www.linux-france.org/prj/imapsync/dist/imapsync-1.267.tgz; - sha256 = "0h9np2b4bdfnhn10cqkw66fki26480w0c8m3bxw0p76xkaggywdy"; + url = "https://fedorahosted.org/released/imapsync/${name}.tgz"; + sha256 = "0ajgzsil2fa15c3ky8cvpvfz62ymlpmr0lnwvi8ifffclv7k2hvq"; }; + patchPhase = '' sed -i -e s@/usr@$out@ Makefile ''; postInstall = '' - # Add Mail::IMAPClient to the runtime search path. - substituteInPlace $out/bin/imapsync --replace '/bin/perl' '/bin/perl -I${MailIMAPClient}/lib/perl5/site_perl'; + wrapProgram $out/bin/imapsync --set PERL5LIB $PERL5LIB ''; - buildInputs = [perl openssl MailIMAPClient]; - meta = { - homepage = "http://www.linux-france.org/prj/imapsync/"; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey + IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString ]; + + meta = with stdenv.lib; { + homepage = http://www.linux-france.org/prj/imapsync/; description = "Mail folder synchronizer between IMAP servers"; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 098d6ef962fe..69f27ff37c23 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c''; + patchPhase = ''sed -i "s,/sbin/route,${nettools}/bin/route," src/tun.c''; + + NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\""; installFlags = "prefix=\${out}"; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix new file mode 100644 index 000000000000..18fd2d12131d --- /dev/null +++ b/pkgs/tools/networking/ip2location/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +let version = "7.0.0"; in +stdenv.mkDerivation { + name = "ip2location-${version}"; + + src = fetchurl { + sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l"; + url = "http://www.ip2location.com/downloads/ip2location-${version}.tar.gz"; + }; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with stdenv.lib; { + inherit version; + description = "Look up locations of host names and IP addresses"; + longDescription = '' + A command-line tool to find the country, region, city,coordinates, + zip code, time zone, ISP, domain name, connection type, area code, + weather, MCC, MNC, mobile brand name, elevation and usage type of + any IP address or host name in the IP2Location databases. + ''; + homepage = http://www.ip2location.com/free/applications; + license = with licenses; [ gpl3Plus lgpl3Plus ]; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; +} diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index a4725e8140f6..a7c844932c96 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchurl, geoip, geolite-legacy, getopt, openssl, perl }: +{ stdenv, fetchurl, getopt, ip2location-c, openssl, perl +, geoip ? null, geolite-legacy ? null +, ip2location-database ? null }: -let version = "0.99.0"; in +let version = "0.99.1"; in stdenv.mkDerivation rec { name = "ipv6calc-${version}"; src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1dgx6gji9dyz77jssk2ax5r0ycq4jcsks71bhvcpb79k02wkaxgw"; + sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h"; }; - buildInputs = [ geoip geolite-legacy getopt openssl ]; + buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ]; nativeBuildInputs = [ perl ]; patchPhase = '' @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { "--enable-geoip" ] ++ stdenv.lib.optional (geolite-legacy != null) [ "--with-geoip-db=${geolite-legacy}/share/GeoIP" + ] ++ stdenv.lib.optional (ip2location-c != null ) [ + "--enable-ip2location" ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 7d94a287968c..877fc088ce2b 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-86-gd84a6b7"; in +let version = "0.5.9-95-g186b116"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "d84a6b7139f3c6d0eb70615543cf368350000e5b"; - sha256 = "1vn84scds93chidcq1dvbwlwzyb935f3116hlgq1q4rwm0225g64"; + rev = "186b116bec11cb941ed91547c9f612b96c96341b"; + sha256 = "06l3565aj4qz4ag7w5pmkfa80mnf8bln2q80hqm4bq8g7sr9z63n"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 51812ff95b75..cc914d6616c9 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-distro=exherbo" "--with-dhclient=${dhcp}/bin/dhclient" + "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd" "--with-dhcpcd=no" diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 9bd1e7f48538..a131c567d89f 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.8p2"; + name = "ntp-4.2.8p3"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d"; + sha256 = "13zkzcvjm5kbxl4xbcmaq07slplhmpkgahzcqnqlba3cxpra9341"; }; configureFlags = [ diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index b2bf65ff9eea..5b95dd159bff 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.8"; + name = "openvpn-2.3.7"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k"; + sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { IPROUTE=${iproute}/sbin/ip ''; - preConfigure = '' - substituteInPlace ./src/openvpn/console.c \ - --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password - ''; - postInstall = '' mkdir -p $out/share/doc/openvpn/examples cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 784ebb2bb7f7..1e8b1a1b299f 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook , curl, trousers, sqlite, iptables, libxml2, openresolv +, ldns, unbound, pcsclite, openssl , enableTNC ? false }: stdenv.mkDerivation rec { @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; buildInputs = - [ gmp pkgconfig python autoreconfHook iptables ] + [ gmp pkgconfig python autoreconfHook iptables ldns unbound openssl pcsclite ] ++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ]; patches = [ @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2" "--enable-eap-mschapv2" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" + "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-aesni" "--enable-af-alg" "--enable-rdrand" ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock" ++ stdenv.lib.optionals enableTNC [ diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 3a89922ca9e5..f7d74b6a39aa 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,15 +1,16 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pre-2015-07-17"; + name = "tinc-1.1pre-2015-07-22"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "f92c3446f2052a59d1e6a28f1bc7cec278cb1e48"; - sha256 = "1y15fk4i6jm9w3qkami2vgp5zfrm5frjxwfmwr4xiw23bmy9cgim"; + rev = "56a8b90d863171d62e0a337b5635fbfc53a67fb0"; + sha256 = "081z4xs5l988g1s0yr7fvnysajd05bx6s54sh84jvq7ij8af71dm"; }; - buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; + buildInputs = [ ncurses readline zlib lzo openssl ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 5d8971e5c6f9..c62d5addb59f 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }: stdenv.mkDerivation rec { - name = "vpnc-rev550"; + name = "vpnc-0.5.3-post-r550"; src = fetchsvn { url = "http://svn.unix-ag.uni-kl.de/vpnc"; rev = "550"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { rm -r $sourceRoot/{trunk,branches,tags} ''; - patches = [ ./makefile.patch ]; + patches = [ ./makefile.patch ./no_default_route_when_netmask.patch ]; # The `etc/vpnc/vpnc-script' script relies on `which' and on # `ifconfig' as found in net-tools (not GNU Inetutils). diff --git a/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch b/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch new file mode 100644 index 000000000000..fa12abe9b776 --- /dev/null +++ b/pkgs/tools/networking/vpnc/no_default_route_when_netmask.patch @@ -0,0 +1,12 @@ +diff -uNr a/vpnc-script b/vpnc-script +--- a/vpnc-script 2015-09-06 13:19:11.408661526 +0200 ++++ b/vpnc-script 2015-09-06 14:47:40.260871556 +0200 +@@ -647,7 +647,7 @@ + echo "$i" | grep : >/dev/null || \ + set_network_route "$i" "255.255.255.255" "32" + done +- elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then ++ elif [ -n "$INTERNAL_IP4_ADDRESS" -a -z "$INTERNAL_IP4_NETMASK" ]; then + set_default_route + fi + if [ -n "$CISCO_IPV6_SPLIT_INC" ]; then diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 022b8dfc2ca4..2357ec77f122 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }: -let version = "1.18.1"; in +let version = "1.18.2"; in stdenv.mkDerivation { name = "dpkg-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb"; + sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i"; }; postPatch = '' @@ -20,10 +20,10 @@ stdenv.mkDerivation { configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}"; preConfigure = '' - # Nice: dpkg has a circular dependency on itself. Its configure + # Nice: dpkg has a circular dependency on itself. Its configure # script calls scripts/dpkg-architecture, which calls "dpkg" in - # $PATH. It doesn't actually use its result, but fails if it - # isn't present. So make a dummy available. + # $PATH. It doesn't actually use its result, but fails if it + # isn't present, so make a dummy available. touch $TMPDIR/dpkg chmod +x $TMPDIR/dpkg PATH=$TMPDIR:$PATH diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index 9e8649537fdd..e8670770c5f4 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: -let rev = "57aeef0b6a3d3c9506e35f57f5b6db33019967e5"; in +let rev = "8a2f5f0607540ffe56b56d52db544373e1efb980"; in stdenv.mkDerivation { name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "edolstra"; repo = "nix-repl"; inherit rev; - sha256 = "1p92zwkpy3iaglq23aydggbl6dbnw97f0v5gy2w74y8pi9d5mgh5"; + sha256 = "0cjablz01i0g9smnavhf86imwx1f9mnh5flax75i615ml71gsr88"; }; buildInputs = [ nix readline ]; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e773b1ff2e10..d193cfa438ed 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -86,13 +86,15 @@ in rec { nix = nixStable; nixStable = common rec { - name = "nix-1.9"; + name = "nix-1.10"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1"; + sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6"; }; }; + nixUnstable = nix; + /* nixUnstable = lib.lowPrio (common rec { name = "nix-1.10pre4212_e12cf82"; src = fetchurl { @@ -100,5 +102,6 @@ in rec { sha256 = "4165db0ea9bb6b5cd96d294348299f20ac045fc18db680104ff98fe9ac893f72"; }; }); + */ } diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 2930e6fdce23..92edd915ad79 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonPackage rec { buildInputs = [ pythonPackages.pbr ]; - pythonPath = with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ dogpile_cache click requests2 diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 7075b03bdfa4..c2842ae2e752 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }: -let version = "1.0.7"; in +let version = "1.0.8"; in stdenv.mkDerivation { name = "packagekit-${version}"; src = fetchurl { - sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi"; + sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l"; url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz"; }; diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index 75ad9382b9f3..92a0e46b79dc 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "afl-${version}"; - version = "1.86b"; + version = "1.88b"; src = fetchurl { url = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz"; - sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r"; + sha256 = "10j0b4kzr4rmflcnxhb2r3klxc4sspx23bpgxjaqflp4z3zf5m1v"; }; # Note: libcgroup isn't needed for building, just for the afl-cgroup diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 73f7f8c9ae5e..36a203a7b507 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -1,16 +1,15 @@ {stdenv, fetchurl}: - + stdenv.mkDerivation { - name = "chkrootkit-0.48"; - + name = "chkrootkit-0.50"; + src = fetchurl { url = ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit.tar.gz; - sha256 = "1yzid6bw092nf8k83y1119kc4ns7r0l3zsfah5xal8kh19ad7cxl"; + sha256 = "1ivclp7ixndacjmf7xgj8lfa6h7ihx44mzzsapqdvf0c5f9gqj4m"; }; installPhase = " mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin "; - } diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 57cc9c242483..faba4037d3dd 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "6.47"; + version = "6.49BETA4"; src = fetchurl { url = "http://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "14d53aji4was68c01pf105n5ylha257wmdbx40ddiqiw42g1x8cg"; + sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna"; }; patches = ./zenmap.patch; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 668a76051153..893b7b319000 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -2,15 +2,24 @@ stdenv.mkDerivation rec { name = "scrypt-${version}"; - version = "1.1.6"; + version = "1.2.0"; src = fetchurl { - url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz"; - sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8"; + url = "https://www.tarsnap.com/scrypt/${name}.tgz"; + sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p"; }; buildInputs = [ openssl ]; + patchPhase = '' + substituteInPlace Makefile \ + --replace "command -p mv" "mv" + substituteInPlace Makefile.in \ + --replace "command -p mv" "mv" + substituteInPlace autocrap/Makefile.am \ + --replace "command -p mv" "mv" + ''; + meta = { description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 0f62fc4e360a..d0c4169a97af 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, attr, keyutils }: -let version = "0.04.15"; in -stdenv.mkDerivation rec { +let + version = "0.04.16"; name = "stress-ng-${version}"; +in stdenv.mkDerivation { + inherit name; src = fetchurl { - sha256 = "1jazcfviqx3pyhv2jzsp6y37ndsj1smfk6jacpxg9vrg5k3cm3wq"; + sha256 = "0v4zqjh07zc8s4dd1w9iri79dcjfbnv7668rbkmp3pgqzpxdy5wx"; url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz"; }; @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { homepage = http://kernel.ubuntu.com/~cking/stress-ng; downloadPage = http://kernel.ubuntu.com/~cking/tarballs/stress-ng/; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = platforms.linux; maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 087a3212fc2e..07349e6ec33b 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "vboot_reference-${version}"; src = fetchgit { - url = "http://git.chromium.org/git/chromiumos/platform/vboot_reference.git"; + url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference; rev = "refs/changes/${checkout}"; sha256 = "00qhwhh5ygrcfm9is8hrk1spqdvfs6aa744h10jbr03zics5bvac"; }; diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix index 30b546361f20..f215c635de5b 100644 --- a/pkgs/tools/text/dos2unix/default.nix +++ b/pkgs/tools/text/dos2unix/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, gettext }: stdenv.mkDerivation rec { - name = "dos2unix-7.2.2"; + name = "dos2unix-7.3"; src = fetchurl { url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz"; - sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww"; + sha256 = "1la496gpc7b1vka36bs54pf85jfbwa6fdplgj6lamvbj59azfxc1"; }; configurePhase = '' diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix new file mode 100644 index 000000000000..365815142d1d --- /dev/null +++ b/pkgs/tools/text/txt2tags/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + version = "2.6"; + name = "txt2tags-${version}"; + + dontBuild = true; + + # Python script, needs the interpreter + propagatedBuildInputs = [ python ]; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/doc" + mkdir -p "$out/share/man/man1/" + sed '1s|/usr/bin/env python|${python}/bin/python|' < txt2tags > "$out/bin/txt2tags" + chmod +x "$out/bin/txt2tags" + gzip - < doc/manpage.man > "$out/share/man/man1/txt2tags.1.gz" + cp doc/userguide.pdf "$out/share/doc" + cp -r extras/ samples/ test/ "$out/share" + ''; + + src = fetchurl { + url = "http://txt2tags.googlecode.com/files/${name}.tgz"; + sha256 = "0p5hql559pk8v5dlzgm75yrcxwvz4z30f1q590yzng0ghvbnf530"; + }; + + meta = { + homepage = http://txt2tags.org/; + description = "A KISS markup language"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ kovirobi ]; + }; +} diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 155817441736..531af472cb40 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.0"; name = "xurls-${version}"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "0v9qfvvwy0pq7wp5q19y4a61mcc1sj8vkhvhb8bk603gzprfs10z"; + sha256 = "1sdxz1vqm9kidva7lilway69n4fdkqa4kdldx47jriq2hr96s7n0"; }; buildInputs = [ go ]; diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix index c2c9a942845a..a822a181a653 100644 --- a/pkgs/tools/typesetting/bibtex-tools/default.nix +++ b/pkgs/tools/typesetting/bibtex-tools/default.nix @@ -13,4 +13,5 @@ stdenv.mkDerivation { --with-hevea=${hevea} --with-latex=${tetex}"; buildInputs = [aterm sdf strategoxt hevea]; + meta.broken = true; } diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix new file mode 100644 index 000000000000..1b6104106ba4 --- /dev/null +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchgit, perl }: + +stdenv.mkDerivation rec { + name = "multimarkdown-${version}"; + version = "4.7.1"; + + src = fetchgit { + url = "https://github.com/fletcher/MultiMarkdown-4.git"; + fetchSubmodules = true; + rev = "dd060247518715ef2b52be22b8f49d0e6d2c3a8b"; + sha256 = "0s7rcxgmv1almlic7bky426x52h7g1pjdhi3y8wf84fpx8c7b6g2"; + }; + + preBuild = '' + substituteInPlace enumsToPerl.pl --replace "/usr/bin/perl" "${perl}/bin/perl" + ''; + + buildInputs = [ stdenv ]; + checkPhase = "make test-all"; + installPhase = "make pkg-install prefix='' DESTDIR=$out; make pkg-install-scripts prefix='' DESTDIR=$out"; + + meta = with stdenv.lib; { + description = "A derivative of Markdown that adds new syntax features"; + longDescription = '' + MultiMarkdown is a lightweight markup language created by + Fletcher T. Penney and based on Markdown, which supports + more export-formats (html, latex, beamer, memoir, odf, opml, + lyx, mmd) and implements some added features currently not + available with plain Markdown syntax. + + It adds the following features to Markdown: + + footnotes + tables + citations and bibliography (works best in LaTeX using BibTeX) + math support + automatic cross-referencing ability + smart typography, with support for multiple languages + image attributes + table and image captions + definition lists + glossary entries (LaTeX only) + document metadata (e.g. title, author, date, etc.) + ''; + homepage = "http://fletcherpenney.net/multimarkdown/"; + # licensed under GPLv2+ or MIT: + # https://raw.githubusercontent.com/fletcher/MultiMarkdown-4/master/LICENSE + license = with stdenv.lib.licenses; [ gpl2Plus ]; + hydraPlatforms = platforms.all; + maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 6cf9ac3e5ce4..e80e53f91284 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,13 +1,10 @@ args: with args; rec { - version = "0.8"; + version = "0.9"; name = "moderntimeline-${version}"; src = fetchurl { - urls = [ - "http://www.ctan.org/tex-archive/macros/latex/contrib/moderntimeline.zip" - "http://mirror.ctan.org/macros/latex/contrib/moderntimeline.zip" - ]; - sha256 = "0y2m0qd0izrfjcwrmf3nvzkqmrhkdhzbv29s4c0knksdnfgcchc8"; + url = "https://github.com/raphink/moderntimeline/archive/v0.9.zip"; + sha256 = "1h1sfdh0whb74y6f999hs80flwpdbs2n4n2b9c450rvs1y7abcml"; }; buildInputs = [texLive unzip]; @@ -15,7 +12,7 @@ rec { doCopy = fullDepEntry ('' mkdir -p $out/texmf-dist/tex/latex/moderntimeline $out/texmf-dist/doc/moderntimeline $out/share mv *.dtx *.ins $out/texmf-dist/tex/latex/moderntimeline/ - mv *.pdf $out/texmf-dist/doc/moderntimeline/ + mv *.md $out/texmf-dist/doc/moderntimeline/ ln -s $out/texmf* $out/share/ '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a786d875bf3..9be2b6dda13c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -611,7 +611,7 @@ let ascii = callPackage ../tools/text/ascii { }; - asciinema = callPackage ../tools/misc/asciinema { }; + asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; }; asymptote = callPackage ../tools/graphics/asymptote { texLive = texLiveAggregationFun { @@ -721,6 +721,8 @@ let bc = callPackage ../tools/misc/bc { }; + bdf2psf = callPackage ../tools/misc/bdf2psf { }; + bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; @@ -818,13 +820,13 @@ let clib = callPackage ../tools/package-management/clib { }; - consul = goPackages.consul; + consul = goPackages.consul.bin // { outputs = [ "bin" ]; }; consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = goPackages.consul-alerts; + consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; }; - consul-template = goPackages.consul-template; + consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; }; corosync = callPackage ../servers/corosync { }; @@ -844,8 +846,6 @@ let tileMode = false; }; - cv = callPackage ../tools/misc/cv { }; - contacts = callPackage ../tools/misc/contacts { }; datamash = callPackage ../tools/misc/datamash { }; @@ -882,18 +882,22 @@ let ent = callPackage ../tools/misc/ent { }; + facter = callPackage ../tools/system/facter {}; + fasd = callPackage ../tools/misc/fasd { }; fop = callPackage ../tools/typesetting/fop { }; filter_audio = callPackage ../development/libraries/filter_audio { }; - fzf = callPackage ../tools/misc/fzf { }; + fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; gist = callPackage ../tools/text/gist { }; gmic = callPackage ../tools/graphics/gmic { }; + mathics = pythonPackages.mathics; + mcrl = callPackage ../tools/misc/mcrl { }; mcrl2 = callPackage ../tools/misc/mcrl2 { }; @@ -948,7 +952,7 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; - mongodb-tools = go14Packages.mongo-tools; + mongodb-tools = goPackages.mongo-tools.bin // { outputs = [ "bin" ]; }; mstflint = callPackage ../tools/misc/mstflint { }; @@ -1066,7 +1070,6 @@ let libceph = ceph.lib; ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { }; ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { }; - ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { }; ceph = callPackage ../tools/filesystems/ceph { }; ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { }); @@ -1258,6 +1261,8 @@ let dbench = callPackage ../development/tools/misc/dbench { }; + dclxvi = callPackage ../development/libraries/dclxvi { }; + dcraw = callPackage ../tools/graphics/dcraw { }; dcfldd = callPackage ../tools/system/dcfldd { }; @@ -1346,7 +1351,7 @@ let doomseeker = callPackage ../applications/misc/doomseeker { }; - drive = callPackage ../applications/networking/drive { goPackages = go14Packages; }; + drive = go14Packages.drive.bin // { outputs = [ "bin" ]; }; driftnet = callPackage ../tools/networking/driftnet {}; @@ -1486,7 +1491,7 @@ let inherit (perlPackages) ImageExifTool JSON; }; - flannel = callPackage ../tools/networking/flannel { }; + flannel = goPackages.flannel.bin // { outputs = [ "bin" ]; }; flashbench = callPackage ../os-specific/linux/flashbench { }; @@ -1575,6 +1580,8 @@ let fsfs = callPackage ../tools/filesystems/fsfs { }; + fuseiso = callPackage ../tools/filesystems/fuseiso { }; + fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; fuse_exfat = callPackage ../tools/filesystems/fuse-exfat { }; @@ -1600,6 +1607,8 @@ let gawkInteractive = appendToName "interactive" (gawk.override { readlineSupport = true; }); + gawp = goPackages.gawp.bin // { outputs = [ "bin" ]; }; + gbdfed = callPackage ../tools/misc/gbdfed { gtk = gtk2; }; @@ -1688,7 +1697,7 @@ let goaccess = callPackage ../tools/misc/goaccess { }; - go-mtpfs = callPackage ../tools/filesystems/go-mtpfs { }; + go-mtpfs = goPackages.mtpfs.bin // { outputs = [ "bin" ]; }; googleAuthenticator = callPackage ../os-specific/linux/google-authenticator { }; @@ -1702,7 +1711,8 @@ let gptfdisk = callPackage ../tools/system/gptfdisk { }; - grafana = callPackage ../development/tools/misc/grafana { }; + grafana-old = callPackage ../development/tools/misc/grafana { }; + grafana = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -1795,6 +1805,8 @@ let gummiboot = callPackage ../tools/misc/gummiboot { }; + gup = callPackage ../development/tools/build-managers/gup {}; + gupnp = callPackage ../development/libraries/gupnp { inherit (gnome) libsoup; }; @@ -1911,9 +1923,7 @@ let imapproxy = callPackage ../tools/networking/imapproxy { }; - imapsync = callPackage ../tools/networking/imapsync { - inherit (perlPackages) MailIMAPClient; - }; + imapsync = callPackage ../tools/networking/imapsync { }; imgurbash = callPackage ../tools/graphics/imgurbash { }; @@ -1927,6 +1937,8 @@ let iodine = callPackage ../tools/networking/iodine { }; + ip2location = callPackage ../tools/networking/ip2location { }; + ipad_charge = callPackage ../tools/misc/ipad_charge { }; iperf2 = callPackage ../tools/networking/iperf/2.nix { }; @@ -2154,7 +2166,7 @@ let lshw = callPackage ../tools/system/lshw { }; lxc = callPackage ../os-specific/linux/lxc { }; - lxd = goPackages.lxd; + lxd = goPackages.lxd.bin // { outputs = [ "bin" ]; }; lzip = callPackage ../tools/compression/lzip { }; @@ -2379,7 +2391,7 @@ let inherit gnumake3; }; - ngrok = callPackage ../tools/misc/ngrok { }; + ngrok = goPackages.ngrok.bin // { outputs = [ "bin" ]; }; noip = callPackage ../tools/networking/noip { }; @@ -2536,6 +2548,8 @@ let opentracker = callPackage ../applications/networking/p2p/opentracker { }; + opentsdb = callPackage ../tools/misc/opentsdb {}; + openvpn = callPackage ../tools/networking/openvpn { }; openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; @@ -2709,7 +2723,7 @@ let polkit_gnome = callPackage ../tools/security/polkit-gnome { }; - popcorntime = callPackage ../applications/video/popcorntime { }; + popcorntime = callPackage ../applications/video/popcorntime { nwjs = nwjs_0_12; }; ponysay = callPackage ../tools/misc/ponysay { }; @@ -2743,6 +2757,8 @@ let polygraph = callPackage ../tools/networking/polygraph { }; + progress = callPackage ../tools/misc/progress { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -2783,6 +2799,8 @@ let ocz-ssd-guru = callPackage ../tools/misc/ocz-ssd-guru { }; + qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; + qastools = callPackage ../tools/audio/qastools { qt = qt4; }; @@ -2998,7 +3016,7 @@ let skippy-xd = callPackage ../tools/X11/skippy-xd {}; - skydns = callPackage ../servers/dns/skydns { }; + skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; }; sipcalc = callPackage ../tools/networking/sipcalc { }; @@ -3051,7 +3069,7 @@ let sourceHighlight = callPackage ../tools/text/source-highlight { }; - spaceFM = callPackage ../applications/misc/spacefm { }; + spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; }; squashfsTools = callPackage ../tools/filesystems/squashfs { }; @@ -3159,8 +3177,6 @@ let telnet = callPackage ../tools/networking/telnet { }; - tessel = callPackage ../applications/misc/tessel { }; - texmacs = callPackage ../applications/editors/texmacs { tex = texLive; /* tetex is also an option */ extraFonts = true; @@ -3184,6 +3200,8 @@ let tlsdate = callPackage ../tools/networking/tlsdate { }; + tmate = callPackage ../tools/misc/tmate { }; + tmpwatch = callPackage ../tools/misc/tmpwatch { }; tmux = callPackage ../tools/misc/tmux { }; @@ -3244,6 +3262,8 @@ let txt2man = callPackage ../tools/misc/txt2man { }; + txt2tags = callPackage ../tools/text/txt2tags { }; + u9fs = callPackage ../servers/u9fs { }; ucl = callPackage ../development/libraries/ucl { }; @@ -3306,6 +3326,7 @@ let viking = callPackage ../applications/misc/viking { inherit (gnome) scrollkeeper; + inherit (gnome3) gexiv2; }; vnc2flv = callPackage ../tools/video/vnc2flv {}; @@ -3454,6 +3475,11 @@ let uptimed = callPackage ../tools/system/uptimed { }; + urjtag = callPackage ../tools/misc/urjtag { + jedecSupport = true; + pythonBindings = true; + }; + urlwatch = callPackage ../tools/networking/urlwatch { }; varnish = callPackage ../servers/varnish { }; @@ -4073,9 +4099,9 @@ let then go_1_4 # missing DWARF files during go-1.5 build else go_1_5; - go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; + go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; }; - gox = goPackages.gox; + gox = goPackages.gox.bin // { outputs = [ "bin" ]; }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -4754,6 +4780,8 @@ let buildRustPackage = callPackage ../build-support/rust { }; }; + rustfmt = callPackage ../development/tools/rust/rustfmt { }; + sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {}; sbcl = callPackage ../development/compilers/sbcl { clisp = clisp; @@ -4880,6 +4908,8 @@ let chibi = callPackage ../development/interpreters/chibi { }; + ceptre = callPackage ../development/interpreters/ceptre { }; + clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good @@ -4994,7 +5024,7 @@ let perf = linuxPackages.perf; }; - mesos-dns = callPackage ../servers/dns/mesos-dns { }; + mesos-dns = goPackages.mesos-dns.bin // { outputs = [ "bin" ]; }; mujs = callPackage ../development/interpreters/mujs { }; @@ -5624,7 +5654,7 @@ let ino = callPackage ../development/arduino/ino { }; - inotifyTools = callPackage ../development/tools/misc/inotify-tools { }; + inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { inherit (xorg) libpciaccess dri2proto libX11 libXext libXv libXrandr; @@ -5684,6 +5714,10 @@ let node_webkit = node_webkit_0_9; + nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { + gconf = pkgs.gnome.GConf; + }; + node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix { gconf = pkgs.gnome.GConf; }; @@ -5855,7 +5889,7 @@ let uncrustify = callPackage ../development/tools/misc/uncrustify { }; vagrant = callPackage ../development/tools/vagrant { - ruby = ruby_2_2_2; + ruby = ruby_2_0_0; }; gdb = callPackage ../development/tools/misc/gdb { @@ -5901,7 +5935,7 @@ let aalib = callPackage ../development/libraries/aalib { }; - accelio = callPackage ../development/libraries/accelio { }; + accelio = callPackage ../development/libraries/accelio { stdenv = overrideCC stdenv gcc5; }; accounts-qt = callPackage ../development/libraries/accounts-qt { }; @@ -6150,8 +6184,6 @@ let dssi = callPackage ../development/libraries/dssi {}; - dragonegg = llvmPackages_35.dragonegg; - dxflib = callPackage ../development/libraries/dxflib {}; eigen = callPackage ../development/libraries/eigen {}; @@ -6272,8 +6304,8 @@ let freealut = callPackage ../development/libraries/freealut { }; freeglut = callPackage ../development/libraries/freeglut { }; - - freenect = callPackage ../development/libraries/freenect { + + freenect = callPackage ../development/libraries/freenect { inherit (xlibs) libXi libXmu; }; @@ -6616,6 +6648,8 @@ let hstr = callPackage ../applications/misc/hstr { }; + htmlcxx = callPackage ../development/libraries/htmlcxx { }; + http-parser = callPackage ../development/libraries/http-parser { inherit (pythonPackages) gyp; }; hunspell = callPackage ../development/libraries/hunspell { }; @@ -6658,6 +6692,8 @@ let intltool = callPackage ../development/tools/misc/intltool { }; + ip2location-c = callPackage ../development/libraries/ip2location-c { }; + irrlicht = callPackage ../development/libraries/irrlicht { }; irrlicht3843 = callPackage ../development/libraries/irrlicht/irrlicht3843.nix { }; @@ -6773,10 +6809,6 @@ let libassuan = callPackage ../development/libraries/libassuan { }; - libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { - automake = automake112x; # fails with 13 and 14 - }; - libasyncns = callPackage ../development/libraries/libasyncns { }; libatomic_ops = callPackage ../development/libraries/libatomic_ops {}; @@ -6983,7 +7015,6 @@ let libev = callPackage ../development/libraries/libev { }; - libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; libevent = callPackage ../development/libraries/libevent { }; libewf = callPackage ../development/libraries/libewf { }; @@ -7434,7 +7465,7 @@ let libusbmuxd = callPackage ../development/libraries/libusbmuxd { }; libunwind = if stdenv.isDarwin - then callPackage ../development/libraries/libunwind/native.nix {} + then libunwindNative else callPackage ../development/libraries/libunwind { }; libunwindNative = callPackage ../development/libraries/libunwind/native.nix {}; @@ -7516,9 +7547,7 @@ let libxslt = callPackage ../development/libraries/libxslt { }; - libixp_for_wmii = lowPrio (import ../development/libraries/libixp_for_wmii { - inherit fetchurl stdenv; - }); + libixp_hg = callPackage ../development/libraries/libixp-hg { }; libyaml = callPackage ../development/libraries/libyaml { }; @@ -7704,7 +7733,6 @@ let nethack = callPackage ../games/nethack { }; - nettle27 = callPackage ../development/libraries/nettle/27.nix { }; nettle = callPackage ../development/libraries/nettle { }; newt = callPackage ../development/libraries/newt { }; @@ -7776,6 +7804,8 @@ let libpng = libpng12; }; + opencv3 = callPackage ../development/libraries/opencv/3.x.nix { }; + # this ctl version is needed by openexr_viewers openexr_ctl = ctl; @@ -7938,6 +7968,8 @@ let ptlib = callPackage ../development/libraries/ptlib {}; + pugixml = callPackage ../development/libraries/pugixml { }; + re2 = callPackage ../development/libraries/re2 { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; @@ -7977,11 +8009,6 @@ let developerBuild = true; }); - qt4SDK = qtcreator.override { - sdkBuild = true; - qtLib = qt48Full; - }; - qt53 = callPackage ../development/libraries/qt-5/5.3 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; @@ -7994,21 +8021,15 @@ let qt5 = qt54; - qt5Full = appendToName "full" (qt53.override { - buildDocs = true; - buildExamples = true; - buildTests = true; - developerBuild = true; - }); + qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; - qt5SDK = qtcreator.override { - sdkBuild = true; - qtLib = qt5Full; - withDocumentation = true; - }; + qt5Full = appendToName "full" (qtEnv { + qtbase = qt5.base; + paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5); + }); qtcreator = callPackage ../development/qtcreator { - qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4 + qtLib = qt54; withDocumentation = true; }; @@ -8043,7 +8064,9 @@ let readosm = callPackage ../development/libraries/readosm { }; - lambdabot = callPackage ../development/tools/haskell/lambdabot { }; + lambdabot = callPackage ../development/tools/haskell/lambdabot { + haskell-lib = haskell.lib; + }; leksah = callPackage ../development/tools/haskell/leksah { inherit (haskellPackages) ghcWithPackages; @@ -8665,8 +8688,8 @@ let go = go_1_4; buildGoPackage = import ../development/go-modules/generic { go = go_1_4; - govers = go14Packages.govers; - inherit lib; + govers = go14Packages.govers.bin; + inherit parallel lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }); @@ -8675,8 +8698,8 @@ let go = go_1_5; buildGoPackage = import ../development/go-modules/generic { go = go_1_5; - govers = go15Packages.govers; - inherit lib; + govers = go15Packages.govers.bin; + inherit parallel lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }); @@ -8706,7 +8729,7 @@ let buildPerlPackage = import ../development/perl-modules/generic perl; - perlPackages = recurseIntoAttrs (import ./perl-packages.nix { + perlPackages = recurseIntoAttrs (callPackage ./perl-packages.nix { inherit pkgs; overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); @@ -8919,8 +8942,8 @@ let bird = callPackage ../servers/bird { }; - bosun = callPackage ../servers/monitoring/bosun { goPackages = go14Packages; }; - scollector = callPackage ../servers/monitoring/bosun/scollector.nix { goPackages = go14Packages; }; + bosun = go14Packages.bosun.bin // { outputs = [ "bin" ]; }; + scollector = bosun; charybdis = callPackage ../servers/irc/charybdis {}; @@ -8951,6 +8974,8 @@ let diod = callPackage ../servers/diod { lua = lua5_1; }; + dnschain = callPackage ../servers/dnschain { }; + dovecot = dovecot21; dovecot21 = callPackage ../servers/mail/dovecot { }; @@ -8959,7 +8984,7 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; - etcd = goPackages.etcd; + etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; }; ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR16; @@ -8976,7 +9001,7 @@ let v8 = v8_3_24_10; }; - etcdctl = goPackages.etcd; + etcdctl = etcd; exim = callPackage ../servers/mail/exim { }; @@ -9001,6 +9026,8 @@ let groovebasin = callPackage ../applications/audio/groovebasin { }; + hbase = callPackage ../servers/hbase {}; + ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; jboss = callPackage ../servers/http/jboss { }; @@ -9076,7 +9103,7 @@ let nsd = callPackage ../servers/dns/nsd (config.nsd or {}); - nsq = callPackage ../servers/nsq { }; + nsq = goPackages.nsq.bin // { outputs = [ "bin" ]; }; openpts = callPackage ../servers/openpts { }; @@ -9140,7 +9167,7 @@ let influxdb = callPackage ../servers/nosql/influxdb { }; - influxdb-backup = callPackage ../servers/nosql/influxdb/backup.nix { }; + influxdb-backup = goPackages.influxdb-backup.bin // { outputs = [ "bin" ]; }; hyperdex = callPackage ../servers/nosql/hyperdex { }; @@ -9207,28 +9234,18 @@ let postgresql_jdbc = callPackage ../servers/sql/postgresql/jdbc { }; - prom2json = callPackage ../servers/monitoring/prometheus/prom2json { }; - prometheus = callPackage ../servers/monitoring/prometheus { }; - prometheus-alertmanager = - callPackage ../servers/monitoring/prometheus/alertmanager { }; - prometheus-cli = - callPackage ../servers/monitoring/prometheus/cli { }; - prometheus-collectd-exporter = - callPackage ../servers/monitoring/prometheus/collectd_exporter { }; - prometheus-haproxy-exporter = - callPackage ../servers/monitoring/prometheus/haproxy_exporter { }; - prometheus-mesos-exporter = - callPackage ../servers/monitoring/prometheus/mesos_exporter { }; - prometheus-mysqld-exporter = - callPackage ../servers/monitoring/prometheus/mysqld_exporter { }; - prometheus-nginx-exporter = - callPackage ../servers/monitoring/prometheus/nginx_exporter { }; - prometheus-node-exporter = - callPackage ../servers/monitoring/prometheus/node_exporter { }; - prometheus-pushgateway = - callPackage ../servers/monitoring/prometheus/pushgateway { }; - prometheus-statsd-bridge = - callPackage ../servers/monitoring/prometheus/statsd_bridge { }; + prom2json = goPackages.prometheus.prom2json.bin // { outputs = [ "bin" ]; }; + prometheus = goPackages.prometheus.prometheus.bin // { outputs = [ "bin" ]; }; + prometheus-alertmanager = goPackages.prometheus.alertmanager.bin // { outputs = [ "bin" ]; }; + prometheus-cli = goPackages.prometheus.cli.bin // { outputs = [ "bin" ]; }; + prometheus-collectd-exporter = goPackages.prometheus.collectd-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-haproxy-exporter = goPackages.prometheus.haproxy-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-mesos-exporter = goPackages.prometheus.mesos-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-mysqld-exporter = goPackages.prometheus.mysqld-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-nginx-exporter = goPackages.prometheus.nginx-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-node-exporter = goPackages.prometheus.node-exporter.bin // { outputs = [ "bin" ]; }; + prometheus-pushgateway = goPackages.prometheus.pushgateway.bin // { outputs = [ "bin" ]; }; + prometheus-statsd-bridge = goPackages.prometheus.statsd-bridge.bin // { outputs = [ "bin" ]; }; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; @@ -9306,7 +9323,7 @@ let shairport-sync = callPackage ../servers/shairport-sync { }; - serfdom = callPackage ../servers/serfdom { }; + serfdom = goPackages.serf.bin // { outputs = [ "bin" ]; }; seyren = callPackage ../servers/monitoring/seyren { }; @@ -9375,7 +9392,7 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol - dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper autoreconfHook + dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; @@ -9777,7 +9794,7 @@ let ]; }; - linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) { + linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -9787,7 +9804,7 @@ let ]; }; - linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) { + linux_4_2 = makeOverridable (import ../os-specific/linux/kernel/linux-4.2.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -9886,6 +9903,8 @@ let nvidia_x11_beta = callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + openafsClient = callPackage ../servers/openafs-client { }; openiscsi = callPackage ../os-specific/linux/open-iscsi { }; @@ -9962,7 +9981,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_1; + linuxPackages_latest = pkgs.linuxPackages_4_2; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -9972,8 +9991,8 @@ let linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); - linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0); linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); + linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; @@ -10081,15 +10100,15 @@ let inherit (gnome) gtk gtkmm; }; - gocode = callPackage ../development/tools/gocode { }; + gocode = goPackages.gocode.bin // { outputs = [ "bin" ]; }; - gotags = callPackage ../development/tools/gotags { }; + gotags = goPackages.gotags.bin // { outputs = [ "bin" ]; }; - golint = goPackages.lint; + golint = goPackages.lint.bin // { outputs = [ "bin" ]; }; godep = callPackage ../development/tools/godep { }; - goimports = callPackage ../development/tools/goimports { }; + goimports = goPackages.tools.bin // { outputs = [ "bin" ]; }; gogoclient = callPackage ../os-specific/linux/gogoclient { }; @@ -10268,7 +10287,7 @@ let ubootJetsonTK1 = callPackage ../misc/uboot { defconfig = "jetson-tk1_defconfig"; targetPlatforms = ["armv7l-linux"]; - filesToInstall = ["u-boot-dtb-tegra.bin"]; + filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"]; }; ubootPcduino3Nano = callPackage ../misc/uboot { @@ -10429,6 +10448,8 @@ let xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { }; + xpilot-ng = callPackage ../games/xpilot { }; + zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; zfs = callPackage ../os-specific/linux/zfs { @@ -10507,14 +10528,14 @@ let docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { }; - docbook_xml_xslt = docbook_xsl; + inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { }) + docbook_xsl + docbook_xsl_ns; - docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { }; + docbook_xml_xslt = docbook_xsl; docbook5_xsl = docbook_xsl_ns; - docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { }; - dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; @@ -10800,6 +10821,7 @@ let callPackage = newScope { boost = boost157; }; } ); bitcoin = altcoins.bitcoin; + bitcoin-xt = altcoins.bitcoin-xt; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; @@ -10976,6 +10998,7 @@ let cmatrix = callPackage ../applications/misc/cmatrix { }; bomi = callPackage ../applications/video/bomi { + youtube-dl = pythonPackages.youtube-dl; pulseSupport = config.pulseaudio or true; }; @@ -11212,6 +11235,8 @@ let ensime = callPackage ../applications/editors/emacs-modes/ensime { }; + erlangMode = callPackage ../applications/editors/emacs-modes/erlang { }; + ess = callPackage ../applications/editors/emacs-modes/ess { }; flycheck = callPackage ../applications/editors/emacs-modes/flycheck { }; @@ -11234,6 +11259,8 @@ let htmlize = callPackage ../applications/editors/emacs-modes/htmlize { }; + ido-ubiquitous = callPackage ../applications/editors/emacs-modes/ido-ubiquitous { }; + icicles = callPackage ../applications/editors/emacs-modes/icicles { }; idris = callPackage ../applications/editors/emacs-modes/idris { }; @@ -11422,9 +11449,7 @@ let fftw = fftwFloat; }; - gnuradio-wrapper = callPackage ../applications/misc/gnuradio/wrapper.nix { }; - - gnuradio-full = gnuradio-wrapper.override { + gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { extraPackages = [ gnuradio-osmosdr ]; }; @@ -11493,14 +11518,15 @@ let filezilla = callPackage ../applications/networking/ftp/filezilla { }; - firefox = callPackage ../applications/networking/browsers/firefox { + inherit (callPackages ../applications/networking/browsers/firefox { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; - }; + }) firefox firefox-esr; - firefoxWrapper = wrapFirefox { browser = pkgs.firefox; }; + firefox-wrapper = wrapFirefox { browser = pkgs.firefox; }; + firefox-esr-wrapper = wrapFirefox { browser = pkgs.firefox-esr; }; firefox-bin = callPackage ../applications/networking/browsers/firefox-bin { gconf = pkgs.gnome.GConf; @@ -11581,7 +11607,7 @@ let inherit pkgs; }); - inherit (gitAndTools) git gitFull gitSVN git-cola svn2git; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar; gitMinimal = git.override { withManual = false; @@ -11811,8 +11837,9 @@ let ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages) TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate TimeDate CGISession DBFile CGIFormBuilder LocaleGettext - RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree Filechdir + RpcXML XMLSimple YAML YAMLLibYAML HTMLTree Filechdir AuthenPassphrase NetOpenIDConsumer LWPxParanoidAgent CryptSSLeay; + inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; imagemagick_light = imagemagick.override { @@ -11833,11 +11860,11 @@ let libxml2 = null; }; - imagemagick = callPackage ../applications/graphics/ImageMagick { + imagemagick = imagemagickBig.override { ghostscript = null; }; - imagemagickBig = imagemagick; + imagemagickBig = callPackage ../applications/graphics/ImageMagick { }; # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { @@ -12209,6 +12236,7 @@ let mpv = callPackage ../applications/video/mpv rec { lua = lua5_1; lua5_sockets = lua5_1_sockets; + youtube-dl = pythonPackages.youtube-dl; bs2bSupport = config.mpv.bs2bSupport or true; youtubeSupport = config.mpv.youtubeSupport or true; cacaSupport = config.mpv.cacaSupport or true; @@ -12223,6 +12251,8 @@ let inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3; }; + multimarkdown = callPackage ../tools/typesetting/multimarkdown { }; + multimon-ng = callPackage ../applications/misc/multimon-ng { }; multisync = callPackage ../applications/misc/multisync { @@ -12338,6 +12368,8 @@ let ncdc = callPackage ../applications/networking/p2p/ncdc { }; + ne = callPackage ../applications/editors/ne { }; + nedit = callPackage ../applications/editors/nedit { motif = lesstif; }; @@ -12501,7 +12533,7 @@ let inherit (xorg) libXpm; }; - pond = callPackage ../applications/networking/pond { }; + pond = goPackages.pond.bin // { outputs = [ "bin" ]; }; ponymix = callPackage ../applications/audio/ponymix { }; @@ -12551,6 +12583,8 @@ let QmidiNet = callPackage ../applications/audio/QmidiNet { }; + qmidiroute = callPackage ../applications/audio/qmidiroute { }; + qmmp = callPackage ../applications/audio/qmmp { }; qrcode = callPackage ../tools/graphics/qrcode {}; @@ -12691,6 +12725,8 @@ let unicode3Support = true; }; + udevil = callPackage ../applications/misc/udevil {}; + # urxvt plugins urxvt_perl = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perl { }; urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; @@ -12701,9 +12737,6 @@ let plugins = [ urxvt_perl urxvt_perls urxvt_tabbedex urxvt_font_size ]; }; - # FIXME: remove somewhere in future - rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; - sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte_290; }; @@ -12813,6 +12846,8 @@ let cura = callPackage ../applications/misc/cura { }; + curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { }; + peru = callPackage ../applications/version-management/peru {}; printrun = callPackage ../applications/misc/printrun { }; @@ -12908,7 +12943,7 @@ let symlinks = callPackage ../tools/system/symlinks { }; - syncthing = callPackage ../applications/networking/syncthing { }; + syncthing = goPackages.syncthing.bin // { outputs = [ "bin" ]; }; # linux only by now synergy = callPackage ../applications/misc/synergy { }; @@ -13048,6 +13083,8 @@ let tribler = callPackage ../applications/networking/p2p/tribler { }; + github-release = callPackage ../development/tools/github/github-release { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; twister = callPackage ../applications/networking/p2p/twister { }; @@ -13263,19 +13300,7 @@ let wmctrl = callPackage ../tools/X11/wmctrl { }; - # I'm keen on wmiimenu only >wmii-3.5 no longer has it... - wmiimenu = import ../applications/window-managers/wmii31 { - libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11; - }; - - wmiiSnap = import ../applications/window-managers/wmii { - libixp = libixp_for_wmii; - inherit fetchurl /* fetchhg */ stdenv gawk; - inherit (xlibs) libX11 xextproto libXt libXext; - includeUnpack = config.stdenv.includeUnpack or false; - }; + wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wordnet = callPackage ../applications/misc/wordnet { }; @@ -13443,7 +13468,6 @@ let xdotool = callPackage ../tools/X11/xdotool { }; - xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { }; xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { }; xen_4_5_1 = callPackage ../applications/virtualization/xen/4.5.1.nix { }; xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; }; @@ -13623,6 +13647,8 @@ let ### GAMES + airstrike = callPackage ../games/airstrike { }; + alienarena = callPackage ../games/alienarena { }; andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; @@ -13664,6 +13690,8 @@ let chessdb = callPackage ../games/chessdb { }; + confd = goPackages.confd.bin // { outputs = [ "bin" ]; }; + construoBase = lowPrio (callPackage ../games/construo { mesa = null; freeglut = null; @@ -13763,6 +13791,8 @@ let kobodeluxe = callPackage ../games/kobodeluxe { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; + lincity = builderDefsPackage (import ../games/lincity) { inherit (xlibs) libX11 libXext xextproto libICE libSM xproto; @@ -14416,8 +14446,6 @@ let ### SCIENCE/PROGRAMMING - kframework = callPackage ../applications/science/programming/kframework { }; - plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC @@ -14527,6 +14555,8 @@ let camlp5 = ocamlPackages.camlp5_strict; }; + hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; }; + isabelle = import ../applications/science/logic/isabelle { inherit (pkgs) stdenv fetchurl nettools perl polyml; inherit (pkgs.emacs24Packages) proofgeneral; @@ -14611,6 +14641,8 @@ let caneda = callPackage ../applications/science/electronics/caneda { }; + geda = callPackage ../applications/science/electronics/geda { }; + gtkwave = callPackage ../applications/science/electronics/gtkwave { }; kicad = callPackage ../applications/science/electronics/kicad { @@ -15128,7 +15160,7 @@ let utf8proc = callPackage ../development/libraries/utf8proc { }; - vault = goPackages.vault; + vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; vbam = callPackage ../misc/emulators/vbam { inherit (xlibs) libpthreadstubs; @@ -15281,32 +15313,28 @@ let arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 bridge_utils = bridge-utils; # added 2015-02-20 + buildbotSlave = buildbot-slave; # added 2014-12-09 + cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 clangAnalyzer = clang-analyzer; # added 2015-02-20 + cool-old-term = cool-retro-term; # added 2015-01-31 + cv = progress; # added 2015-09-06 + firefoxWrapper = firefox-wrapper; + haskell-ng = haskell; # 2015-04-19 + haskellngPackages = haskellPackages; # 2015-04-19 + htmlTidy = html-tidy; # added 2014-12-06 + inherit (haskell.compiler) jhc uhc; # 2015-05-15 + inotifyTools = inotify-tools; + jquery_ui = jquery-ui; # added 2014-09-07 + libtidy = html-tidy; # added 2014-12-21 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 - jquery_ui = jquery-ui; # added 2014-09-07 - youtubeDL = youtube-dl; # added 2014-10-26 - youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 + nfsUtils = nfs-utils; # added 2014-12-06 rdiff_backup = rdiff-backup; # added 2014-11-23 - htmlTidy = html-tidy; # added 2014-12-06 - libtidy = html-tidy; # added 2014-12-21 + rssglx = rss-glx; #added 2015-03-25 + rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 - nfsUtils = nfs-utils; # added 2014-12-06 - buildbotSlave = buildbot-slave; # added 2014-12-09 - cool-old-term = cool-retro-term; # added 2015-01-31 - rssglx = rss-glx; #added 2015-03-25 - haskell-ng = haskell; # 2015-04-19 - haskellngPackages = haskellPackages; # 2015-04-19 - inherit (haskell.compiler) jhc uhc; # 2015-05-15 - cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 - - opentsdb = callPackage ../tools/misc/opentsdb {}; - - hbase = callPackage ../servers/hbase {}; - - udevil = callPackage ../applications/misc/udevil {}; - - facter = callPackage ../tools/system/facter {}; + youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 + youtubeDL = youtube-dl; # added 2014-10-26 }; in self; in pkgs diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 4e03c300448f..6ec01551aed6 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -828,13 +828,14 @@ let self = _self // overrides; idris-mode = melpaBuild rec { pname = "idris-mode"; - version = "0.9.18"; + version = "0.9.19"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; rev = version; - sha256 = "11dw2ydlqhqx569wrp56w11rhgvm6mb6mzq2cwsv2vfyjvvawyxg"; + sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92"; }; + packageRequires = [ prop-menu ]; meta = { license = gpl3Plus; }; }; @@ -1105,6 +1106,18 @@ let self = _self // overrides; meta = { license = gpl3Plus; }; }; + prop-menu = melpaBuild rec { + pname = "prop-menu"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "david-christiansen"; + repo = "${pname}-el"; + rev = version; + sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc"; + }; + meta = { license = gpl3Plus; }; + }; + rainbow-delimiters = melpaBuild rec { pname = "rainbow-delimiters"; version = "2.1.1"; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3fcc63421b9f..567259dfebef 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -19,10 +19,11 @@ let ## OFFICIAL GO PACKAGES crypto = buildFromGitHub { - rev = "e7913d6af127b363879a06a5ae7c5e93c089aedd"; + rev = "d5c5f1769f2fcd2377be6f29863081f59a4fc80f"; + date = "2015-08-29"; owner = "golang"; repo = "crypto"; - sha256 = "0g2gm2wmanprsirmclxi8qxjkw93nih60ff8jwrfb4wyn7hxbds7"; + sha256 = "0rkcvl3q8akkar4rmj052z23y61hbav9514ky6grb4gvxfx4ydbn"; goPackagePath = "golang.org/x/crypto"; goPackageAliases = [ "code.google.com/p/go.crypto" @@ -31,30 +32,29 @@ let }; glog = buildFromGitHub { - rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + date = "2015-07-31"; owner = "golang"; repo = "glog"; - sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; }; - image = buildGoPackage rec { - rev = "d8e202c6ce59fad0017414839b6648851d10767e"; - name = "image-${stdenv.lib.strings.substring 0 7 rev}"; + image = buildFromGitHub { + rev = "8ab1ac6834edd43d91cbe24272897a87ce7e835e"; + date = "2015-08-23"; + owner = "golang"; + repo = "image"; + sha256 = "1ckr7yh5dx2kbvp9mis7i090ss9qcz46sazrj9f2hw4jj5g3y7dr"; goPackagePath = "golang.org/x/image"; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "image"; - sha256 = "0cxymm28rgbzsk76d19wm8fwp40dkwxhzmmdjnbkw5541272339l"; - }; + goPackageAliases = [ "github.com/golang/image" ]; }; net = buildFromGitHub { - rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7"; - owner = "golang"; - repo = "net"; - sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v"; + rev = "ea47fc708ee3e20177f3ca3716217c4ab75942cb"; + date = "2015-08-29"; + owner = "golang"; + repo = "net"; + sha256 = "0x1pmg97n7l62vak9qnjdjrrfl98jydhv6j0w3jkk4dycdlzn30d"; goPackagePath = "golang.org/x/net"; goPackageAliases = [ "code.google.com/p/go.net" @@ -65,10 +65,11 @@ let }; oauth2 = buildFromGitHub { - rev = "f98d0160877ab4712b906626425ed8b0b320907c"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + date = "2015-06-23"; owner = "golang"; repo = "oauth2"; - sha256 = "0hi54mm63ha7a75avydj6xm0a4dd2njdzllr9y2si1i1wnijqw2i"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; goPackagePath = "golang.org/x/oauth2"; goPackageAliases = [ "github.com/golang/oauth2" ]; propagatedBuildInputs = [ net gcloud-golang-compute-metadata ]; @@ -76,32 +77,18 @@ let protobuf = buildFromGitHub { - rev = "68c687dc49948540b356a6b47931c9be4fcd0245"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + date = "2015-08-23"; owner = "golang"; repo = "protobuf"; - sha256 = "0va2x13mygmkvr7ajkg0fj4i1ha0jbxgghya20qgsh0vlp7k5maf"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; goPackagePath = "github.com/golang/protobuf"; goPackageAliases = [ "code.google.com/p/goprotobuf" ]; }; - gogo.protobuf = buildGoPackage rec { - rev = "499788908625f4d83de42a204d1350fde8588e4f"; - name = "protobuf-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/gogo/protobuf"; - goPackageAliases = [ "code.google.com/p/gogoprotobuf/proto" "code.google.com/p/goprotobuf/proto" ]; - - src = fetchFromGitHub { - inherit rev; - owner = "gogo"; - repo = "protobuf"; - sha256 = "09h2j0apl70709nbqasqrkss6fdk99xm7xr5ci311dl48rmm1dzn"; - }; - - subPackages = [ "proto" ]; - }; - snappy = buildFromGitHub { rev = "0c7f8a7704bfec561913f4df52c832f094ef56f0"; + date = "2015-07-21"; owner = "golang"; repo = "snappy"; sha256 = "17j421ra8jm2da8gc0sk71g3n1nizqsfx1mapn255nvs887lqm0y"; @@ -109,10 +96,11 @@ let }; text = buildFromGitHub { - rev = "3eb7007b740b66a77f3c85f2660a0240b284115a"; + rev = "505f8b49cc14d790314b7535959a10b87b9161c7"; + date = "2015-08-27"; owner = "golang"; repo = "text"; - sha256 = "1pxrqbs760azmjaigf63qd6rwmz51hi6i8fq0vwcf5svxgxz2szp"; + sha256 = "0h31hyb1ijs7zcsmpwa713x41k1wkh0igv7i4chwvwyjyl7zligy"; goPackagePath = "golang.org/x/text"; goPackageAliases = [ "github.com/golang/text" ]; }; @@ -128,12 +116,12 @@ let preConfigure = '' # Make the builtin tools available here - mkdir -p $out/bin + mkdir -p $bin/bin eval $(go env | grep GOTOOLDIR) find $GOTOOLDIR -type f | while read x; do - ln -sv "$x" "$out/bin" + ln -sv "$x" "$bin/bin" done - export GOTOOLDIR=$out/bin + export GOTOOLDIR=$bin/bin ''; excludedPackages = "\\(" @@ -163,6 +151,13 @@ let sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; }; + asciinema = buildFromGitHub { + rev = "v1.1.1"; + owner = "asciinema"; + repo = "asciinema"; + sha256 = "0k48k8815k433s25lh8my2swl89kczp0m2gbqzjlpy1xwmk06nxc"; + }; + asn1-ber = buildGoPackage rec { rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}"; @@ -243,6 +238,17 @@ let sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; }; + bosun = buildFromGitHub { + rev = "0.3.0"; + owner = "bosun-monitor"; + repo = "bosun"; + sha256 = "05qfhm5ipdry0figa0rhmg93c45dzh2lwpia73pfxp64l1daqa3a"; + goPackagePath = "bosun.org"; + # Todo: Split these derivations if worried about size on each machine + subPackages = [ "cmd/bosun" "cmd/scollector" ]; + disabled = !isGo14; + }; + bufio = buildFromGitHub { rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; owner = "vmihailenco"; @@ -378,17 +384,11 @@ let sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0"; }; - consul = buildGoPackage rec { + consul = buildFromGitHub { rev = "v0.5.2"; - name = "consul-${rev}"; - goPackagePath = "github.com/hashicorp/consul"; - - src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "consul"; - sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; - }; + owner = "hashicorp"; + repo = "consul"; + sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; buildInputs = [ circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint @@ -401,79 +401,41 @@ let passthru.ui = pkgs.consul-ui; }; - consul-alerts = buildGoPackage rec { - rev = "7dff28aa4c8c883a65106f8ec22796e1a589edab"; - name = "consul-alerts-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/AcalephStorage/consul-alerts"; + consul-api = buildFromGitHub { + inherit (consul) rev owner repo sha256; + subPackages = [ "api" ]; + }; + + consul-alerts = buildFromGitHub { + rev = "6eb4bc556d5f926dbf15d86170664d35d504ae54"; + date = "2015-08-09"; + owner = "AcalephStorage"; + repo = "consul-alerts"; + sha256 = "191bmxix3nl4pr26hcdfxa9qpv5dzggjvi86h2slajgyd2rzn23b"; renameImports = '' # Remove all references to included dependency store - rm -rf go/src/${goPackagePath}/Godeps + rm -rf go/src/github.com/AcalephStorage/consul-alerts/Godeps govers -d -m github.com/AcalephStorage/consul-alerts/Godeps/_workspace/src/ "" - - # Fix references to consul-api - govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api - sed -i 's,consulapi,api,g' go/src/${goPackagePath}/consul/client.go - sed -i 's,consulapi,api,g' go/src/${consul-skipper.goPackagePath}/skipper.go ''; - src = fetchFromGitHub { - inherit rev; - owner = "AcalephStorage"; - repo = "consul-alerts"; - sha256 = "1vwybkvjgyilxk3l6avzivd31l8gnk8d0v7bl10qll0cd068fabq"; - }; - - # We just want the consul api not all of consul - extraSrcs = [ - { inherit (consul) src goPackagePath; } - { inherit (influxdb8) src goPackagePath; } - { inherit (consul-skipper) src goPackagePath; } - ]; + # Temporary fix for name change + postPatch = '' + sed -i 's,SetApiKey,SetAPIKey,' notifier/opsgenie-notifier.go + ''; - buildInputs = [ logrus docopt-go hipchat-go gopherduty ]; + buildInputs = [ logrus docopt-go hipchat-go gopherduty consul-api opsgenie-go-sdk influxdb8-client ]; }; - consul-migrate = buildGoPackage rec { - rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c"; - name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hashicorp/consul-migrate"; - - src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "consul-migrate"; - sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3"; - }; - + consul-migrate = buildFromGitHub { + rev = "678fb10cdeae25ab309e99e655148f0bf65f9710"; + date = "2015-05-19"; + owner = "hashicorp"; + repo = "consul-migrate"; + sha256 = "18zqyzbc3pny700fnh4hi45i5mlsramqykikcr7lgyx7id6alf16"; buildInputs = [ raft raft-boltdb raft-mdb ]; }; - consul-skipper = buildGoPackage rec { - rev = "729b4fdcc7f572f7c083673595f939256b80b76f"; - name = "consul-skipper-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/darkcrux/consul-skipper"; - - renameImports = '' - govers -d -m github.com/armon/consul-api github.com/hashicorp/consul/api - sed -i 's,consulapi,api,g' go/src/${goPackagePath}/skipper.go - ''; - - src = fetchFromGitHub { - inherit rev; - owner = "darkcrux"; - repo = "consul-skipper"; - sha256 = "0shqvihbmq1w5ddnkn62qd4k6gs5zalq6k4alacjz92bwf6d2x6x"; - }; - - # We just want the consul api not all of consul - extraSrcs = [ - { inherit (consul) src goPackagePath; } - ]; - - buildInputs = [ logrus ]; - }; - consul-template = buildGoPackage rec { rev = "v0.9.0"; name = "consul-template-${rev}"; @@ -520,8 +482,6 @@ let name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/godbus/dbus"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "godbus"; @@ -531,10 +491,11 @@ let }; dns = buildFromGitHub { - rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1"; + rev = "e59f851c912767b1db587dcabee6e6652e495c75"; + date = "2015-07-22"; owner = "miekg"; repo = "dns"; - sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq"; + sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp"; }; docopt-go = buildFromGitHub { @@ -544,6 +505,19 @@ let sha256 = "1sddkxgl1pwlipfvmv14h8vg9b9wq1km427j1gjarhb5yfqhh3l1"; }; + drive = buildFromGitHub { + rev = "4530cf8d59e1047cb1c005a6bd5b14ecb98b9e68"; + owner = "odeke-em"; + repo = "drive"; + sha256 = "1y4qlzvgg84mh8l6bhaazzy6bv6dwjcbpm0rxvvc5aknvvh581ps"; + subPackages = [ "cmd/drive" ]; + buildInputs = [ + pb go-isatty command dts odeke-em.log statos xon odeke-em.google-api-go-client + cli-spinner oauth2 text net + ]; + disabled = !isGo14; + }; + dts = buildFromGitHub { rev = "ec2daabf2f9078e887405f7bcddb3d79cb65502d"; owner = "odeke-em"; @@ -551,6 +525,14 @@ let sha256 = "0vq3cz4ab9vdsz9s0jjlp7z27w218jjabjzsh607ps4i8m5d441s"; }; + du = buildFromGitHub { + rev = "3c0690cca16228b97741327b1b6781397afbdb24"; + date = "2015-08-05"; + owner = "calmh"; + repo = "du"; + sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; + }; + ed25519 = buildGoPackage rec { rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; name = "ed25519-${stdenv.lib.strings.substring 0 7 rev}"; @@ -570,11 +552,10 @@ let }; etcd = buildFromGitHub { - rev = "v2.1.1"; + rev = "v2.1.2"; owner = "coreos"; repo = "etcd"; - sha256 = "0jd97091jwwdvx50vbdi1py9v5w9fk86cw85p0zinb0ww6bs4y0s"; - excludedPackages = "Godeps"; + sha256 = "1d3wl9rqbhkkdhfkjfrzjfcwz8hx315zbjbmij3pf62bc1p5nh60"; }; fsnotify.v0 = buildGoPackage rec { @@ -591,6 +572,13 @@ let }; }; + flannel = buildFromGitHub { + rev = "v0.5.3"; + owner = "coreos"; + repo = "flannel"; + sha256 = "0d9khv0bczvsaqnz16p546m4r5marmnkcrdhi0f3ajnwxb776r9p"; + }; + fsnotify.v1 = buildGoPackage rec { rev = "v1.2.0"; name = "fsnotify.v1-${rev}"; @@ -604,6 +592,17 @@ let }; }; + fzf = buildFromGitHub { + rev = "0.10.4"; + owner = "junegunn"; + repo = "fzf"; + sha256 = "06wda8pm1invnj4sfwcicw9qim3jdf9s1fcrai7xqz7wgy74qv1f"; + + buildInputs = [ + crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text + ]; + }; + g2s = buildFromGitHub { rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; owner = "peterbourgon"; @@ -611,6 +610,24 @@ let sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; }; + gawp = buildFromGitHub { + rev = "488705639109de54d38974cc31353d34cc2cd609"; + date = "2015-08-31"; + owner = "martingallagher"; + repo = "gawp"; + sha256 = "0iqqd63nqdijdskdb9f0jwnm6akkh1p2jw4p2w7r1dbaqz1znyay"; + dontInstallSrc = true; + buildInputs = [ fsnotify.v1 yaml-v2 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/martingallagher/gawp"; + description = "A simple, configurable, file watching, job execution tool implemented in Go."; + maintainers = with maintainers; [ kamilchm ]; + license = licenses.asl20 ; + platforms = platforms.all; + }; + }; + gcloud-golang = buildFromGitHub { rev = "6335269abf9002cf5a84613c13cda6010842b834"; owner = "GoogleCloudPlatform"; @@ -619,6 +636,7 @@ let goPackagePath = "google.golang.org/cloud"; buildInputs = [ net oauth2 protobuf google-api-go-client grpc ]; excludedPackages = "oauth2"; + meta.hydraPlatforms = [ ]; }; gcloud-golang-compute-metadata = buildGoPackage rec { @@ -730,6 +748,14 @@ let propagatedBuildInputs = [ inf snappy groupcache ]; }; + gocode = buildFromGitHub { + rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0"; + date = "2015-09-03"; + owner = "nsf"; + repo = "gocode"; + sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv"; + }; + gocolorize = buildGoPackage rec { rev = "v1.0.0"; name = "gocolorize-${rev}"; @@ -772,6 +798,7 @@ let govers = buildFromGitHub { rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; + date = "2015-01-09"; owner = "rogpeppe"; repo = "govers"; sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; @@ -792,32 +819,22 @@ let sha256 = "1xx6lpv1r2sji8m9w35a2fkr9v4vsgvxrrahcq9bdg75qvadq91d"; }; - golang_protobuf_extensions = buildGoPackage rec { - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - - src = fetchFromGitHub { - inherit rev; - owner = "matttproud"; - repo = "golang_protobuf_extensions"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - + golang_protobuf_extensions = buildFromGitHub { + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + date = "2015-04-06"; + owner = "matttproud"; + repo = "golang_protobuf_extensions"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; buildInputs = [ protobuf ]; }; - goleveldb = buildGoPackage rec { - rev = "e9e2c8f6d3b9c313fb4acaac5ab06285bcf30b04"; - name = "goleveldb-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/syndtr/goleveldb"; - src = fetchFromGitHub { - inherit rev; - owner = "syndtr"; - repo = "goleveldb"; - sha256 = "0vg3pcrbdhbmanwkc5njxagi64f4k2ikfm173allcghxcjamrkwv"; - }; - propagatedBuildInputs = [ ginkgo gomega gosnappy ]; + goleveldb = buildFromGitHub { + rev = "183614d6b32571e867df4cf086f5480ceefbdfac"; + date = "2015-06-17"; + owner = "syndtr"; + repo = "goleveldb"; + sha256 = "0crslwglkh8b3204l4zvav712a7yd2ykjnbrnny6yrq94mlvba8r"; + propagatedBuildInputs = [ ginkgo gomega snappy ]; }; gollectd = buildFromGitHub { @@ -842,13 +859,13 @@ let }; google-api-go-client = buildFromGitHub { - rev = "ca0499560ea76ac6561548f36ffe841364fe2348"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + date = "2015-08-19"; owner = "google"; repo = "google-api-go-client"; - sha256 = "1w6bjhd8p6fxvm002jqk3r9vk50hlaqnxc9g6msb2wswy3nxcw57"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; goPackagePath = "google.golang.org/api"; goPackageAliases = [ "github.com/google/google-api-client" ]; - excludedPackages = "examples"; buildInputs = [ net ]; }; @@ -862,9 +879,6 @@ let repo = "google-api-go-client"; sha256 = "1fidlljxnd82i2r9yia0b9gh0vv3hwb5k65papnvw7sqpc4sriby"; }; - preBuild = '' - rm -rf go/src/${goPackagePath}/examples - ''; buildInputs = [ net ]; propagatedBuildInputs = [ google-api-go-client ]; }; @@ -891,7 +905,22 @@ let repo = "goproxy"; sha256 = "1zz425y8byjaa9i7mslc9anz9w2jc093fjl0562rmm5hh4rc5x5f"; buildInputs = [ go-charset ]; - excludedPackages = "examples"; + }; + + goreq = buildFromGitHub { + rev = "72c51a544272e007ab3da4f7d9ac959b7af7af03"; + date = "2015-08-18"; + owner = "franela"; + repo = "goreq"; + sha256 = "0dnqbijdzp2dgsf6m934nadixqbv73q0zkqglaa956zzw0pyhcxp"; + }; + + gotags = buildFromGitHub { + rev = "be986a34e20634775ac73e11a5b55916085c48e7"; + date = "2015-08-03"; + owner = "jstemmer"; + repo = "gotags"; + sha256 = "071wyq90b06xlb3bb0l4qjz1gf4nnci4bcngiddfcxf2l41w1vja"; }; gosnappy = buildFromGitHub { @@ -1040,17 +1069,12 @@ let sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; }; - go-fuse = buildGoPackage rec { - rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58"; - name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hanwen/go-fuse"; - src = fetchFromGitHub { - inherit rev; - owner = "hanwen"; - repo = "go-fuse"; - sha256 = "0lycfhchn88kbs81ypz8m5jh032fpbv14gldrjirf32wm1d4f8pj"; - }; - subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ]; + go-fuse = buildFromGitHub rec { + rev = "324ea173d0a4d90e0e97c464a6ad33f80c9587a8"; + date = "2015-07-27"; + owner = "hanwen"; + repo = "go-fuse"; + sha256 = "0r5amgnpb4g7b6kpz42vnj01w515by4yhy64s5lqf3snzjygaycf"; }; go-github = buildFromGitHub { @@ -1060,7 +1084,6 @@ let sha256 = "0ygh0f6p679r095l4bym8q4l45w2l3d8r3hx9xrnnppxq59i2395"; buildInputs = [ oauth2 ]; propagatedBuildInputs = [ go-querystring ]; - excludedPackages = "examples"; }; go-gypsy = buildFromGitHub { @@ -1078,10 +1101,11 @@ let }; go-hostpool = buildFromGitHub { - rev = "fed86fae5cacdc77e7399937e2f8836563620a2e"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + date = "2015-03-31"; owner = "bitly"; repo = "go-hostpool"; - sha256 = "0nbssfp5ksj4hhc0d8lfq54afd9nqv6qzk3vi6rinxr3fgplrj44"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; }; go-ini = buildFromGitHub { @@ -1121,33 +1145,30 @@ let goPackagePath = "gopkg.in/lxc/go-lxc.v2"; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.lxc ]; - excludedPackages = "examples"; }; - rcrowley.go-metrics = buildGoPackage rec { - rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df"; - name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/rcrowley/go-metrics"; - src = fetchFromGitHub { - inherit rev; - owner = "rcrowley"; - repo = "go-metrics"; - sha256 = "07dc74kiam8v5my7rhi3yxqrpnaapladhk8b3qbnrpjk3shvnx5f"; - }; + go-lz4 = buildFromGitHub { + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + owner = "bkaradzic"; + repo = "go-lz4"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; - buildInputs = [ influxdb8 stathat ]; + rcrowley.go-metrics = buildFromGitHub { + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + date = "2015-08-22"; + owner = "rcrowley"; + repo = "go-metrics"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + propagatedBuildInputs = [ stathat ]; }; - appengine = buildGoPackage rec { - rev = "25b8450bec636c6b6e3b9b33d3a3f55230b10812"; - name = "appengine-${stdenv.lib.strings.substring 0 7 rev}"; + appengine = buildFromGitHub { + rev = "72f4367c4f14a20a98dcc8b762953b40788407be"; + owner = "golang"; + repo = "appengine"; + sha256 = "1phjkb0f0xp08db3irbf5wzdsxzsddsig5wv70wvmnr44ijllh4f"; goPackagePath = "google.golang.org/appengine"; - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "appengine"; - sha256 = "1b0v244hmw8078601v18xda501aix0kw4q2m1g3ai33dl0p2dh2n"; - }; buildInputs = [ protobuf net ]; }; @@ -1173,24 +1194,21 @@ let sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; }; - go-nsq = buildGoPackage rec { - rev = "c79a282f05364e340eadc2ce2f862a3d44eea9c0"; - name = "go-nsq-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/bitly/go-nsq"; - src = fetchFromGitHub { - inherit rev; - owner = "bitly"; - repo = "go-nsq"; - sha256 = "19jlwj5419p5xwjzfnzlddjnbh5g7ifnqhd00i5p0b6ww1gk011p"; - }; + go-nsq = buildFromGitHub { + rev = "v1.0.4"; + owner = "nsqio"; + repo = "go-nsq"; + sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"; propagatedBuildInputs = [ go-simplejson go-snappystream ]; + goPackageAliases = [ "github.com/bitly/go-nsq" ]; }; go-options = buildFromGitHub { - rev = "896a539cd709f4f39d787562d1583c016ce7517e"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + date = "2014-12-20"; owner = "mreiferson"; repo = "go-options"; - sha256 = "0hg0n5grcjcj5719rqchz0plp39wfk3znqxw8y354k4jwsqwmn17"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; }; go-querystring = buildFromGitHub { @@ -1231,6 +1249,22 @@ let }; }; + go-restful = buildFromGitHub { + rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; + owner = "emicklei"; + repo = "go-restful"; + sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; + }; + + go-repo-root = buildFromGitHub { + rev = "90041e5c7dc634651549f96814a452f4e0e680f9"; + date = "2014-09-11"; + owner = "cstrahan"; + repo = "go-repo-root"; + sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; + buildInputs = [ tools ]; + }; + go-runit = buildFromGitHub { rev = "a9148323a615e2e1c93b7a9893914a360b4945c8"; owner = "soundcloud"; @@ -1239,22 +1273,19 @@ let }; go-simplejson = buildFromGitHub { - rev = "1cfceb0e12f47ec02665ef480212d7b531d6f4c5"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + date = "2015-03-31"; owner = "bitly"; repo = "go-simplejson"; - sha256 = "1d8x0himl58qn87lv418djy6mbs66p9ai3zpqq13nhkfl67fj3bi"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; }; - go-snappystream = buildGoPackage rec { + go-snappystream = buildFromGitHub { rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; - name = "go-snappystream-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/mreiferson/go-snappystream"; - src = fetchFromGitHub { - inherit rev; - owner = "mreiferson"; - repo = "go-snappystream"; - sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; - }; + date = "2015-04-16"; + owner = "mreiferson"; + repo = "go-snappystream"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; }; go-sqlite3 = buildFromGitHub { @@ -1277,8 +1308,6 @@ let name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-systemd"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "coreos"; @@ -1295,23 +1324,16 @@ let owner = "stgraber"; repo = "lxd-go-systemd"; sha256 = "006dhy3j8ld0kycm8hrjxvakd7xdn1b6z2dsjp1l4sqrxdmm188w"; - excludedPackages = "examples"; buildInputs = [ dbus ]; }; - go-update = buildGoPackage rec { - rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d"; - name = "go-update-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/inconshreveable/go-update"; - + go-update-v0 = buildFromGitHub { + rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; + owner = "inconshreveable"; + repo = "go-update"; + sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"; + goPackagePath = "gopkg.in/inconshreveable/go-update.v0"; buildInputs = [ osext binarydist ]; - - src = fetchFromGitHub { - inherit rev; - owner = "inconshreveable"; - repo = "go-update"; - sha256 = "16zaxa0i07ismxdmkvjj4dpyc9lgp6wa94q090m9a48si40w9sjn"; - }; }; go-uuid = buildFromGitHub { @@ -1331,6 +1353,7 @@ let go-zookeeper = buildFromGitHub { rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + date = "2015-06-02"; owner = "samuel"; repo = "go-zookeeper"; sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; @@ -1343,7 +1366,6 @@ let repo = "lint"; sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9"; excludedPackages = "testdata"; - dontInstallSrc = true; buildInputs = [ tools ]; }; @@ -1385,14 +1407,15 @@ let }; grpc = buildFromGitHub { - rev = "7d81e8054fb2d57468136397b9b681e4ba4a7f8e"; + rev = "d455e65570c07e6ee7f23275063fbf34660ea616"; + date = "2015-08-29"; owner = "grpc"; repo = "grpc-go"; - sha256 = "0hknsqyzpnvjc2jvm741b16qi4jayijyhpxinskkm0nj0iy59h27"; + sha256 = "08vra95hc8ihnj353680zhiqrv3ssw5yywkrifzb1zwl0l3cs2hr"; goPackagePath = "google.golang.org/grpc"; goPackageAliases = [ "github.com/grpc/grpc-go" ]; - propagatedBuildInputs = [ http2 net protobuf oauth2 glog ]; - excludedPackages = "\\(examples\\|benchmark\\)"; + propagatedBuildInputs = [ http2 net protobuf oauth2 glog etcd ]; + excludedPackages = "\\(test\\|benchmark\\)"; }; gucumber = buildGoPackage rec { @@ -1424,8 +1447,6 @@ let name = "hipchat-go-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/tbruyelle/hipchat-go"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "tbruyelle"; @@ -1457,10 +1478,11 @@ let }; httprouter = buildFromGitHub { - rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1"; + rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; + date = "2015-07-08"; owner = "julienschmidt"; repo = "httprouter"; - sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9"; + sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; }; inf = buildFromGitHub { @@ -1472,40 +1494,30 @@ let goPackageAliases = [ "github.com/go-inf/inf" ]; }; - influxdb = buildGoPackage rec { - rev = "50a2b9ba0f189213fc399f59247787e71b872b2d"; - name = "influxdb-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/influxdb/influxdb"; - goPackageAliases = [ - "github.com/influxdb/influxdb-go" - ]; - - src = fetchFromGitHub { - inherit rev; - owner = "influxdb"; - repo = "influxdb"; - sha256 = "0spwnr9dwxwrjxrajpcspj3aci2ylkrm085jhq7rd99nmbsms6jq"; - }; - - propagatedBuildInputs = [ bolt crypto statik liner toml pat gollectd gogo.protobuf raft raft-boltdb pool ]; + influxdb = buildFromGitHub { + rev = "v0.9.3"; + owner = "influxdb"; + repo = "influxdb"; + sha256 = "0hsvm8ls1g12j1d5ap396vqfpvd0g72hymhczdqg6z96h3zi90bx"; + propagatedBuildInputs = [ raft raft-boltdb snappy crypto gogo.protobuf pool pat toml gollectd statik liner ]; + excludedPackages = "test"; }; - influxdb8 = buildGoPackage rec { + influxdb8-client = buildFromGitHub{ rev = "v0.8.8"; - name = "influxdb-${rev}"; - goPackagePath = "github.com/influxdb/influxdb"; - goPackageAliases = [ - "github.com/influxdb/influxdb-go" - ]; - - src = fetchFromGitHub { - inherit rev; - owner = "influxdb"; - repo = "influxdb"; - sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv"; - }; + owner = "influxdb"; + repo = "influxdb"; + sha256 = "0xpigp76rlsxqj93apjzkbi98ha5g4678j584l6hg57p711gqsdv"; + subPackages = [ "client" ]; + }; - buildInputs = [ statik crypto gogo.protobuf log4go toml pmylund.go-cache gollectd pat dgnorton.goback mux context gocheck influx.gomdb levigo ]; + influxdb-backup = buildFromGitHub { + rev = "4556edbffa914a8c17fa1fa1564962a33c6c7596"; + date = "2014-07-28"; + owner = "eckardt"; + repo = "influxdb-backup"; + sha256 = "2928063e6dfe4be7b69c8e72e4d6a5fc557f0c75e9625fadf607d59b8e80e34b"; + buildInputs = [ eckardt.influxdb-go ]; }; eckardt.influxdb-go = buildGoPackage rec { @@ -1533,17 +1545,12 @@ let sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; }; - ipfs = buildGoPackage rec { - rev = "952dc9c60fdff27902749222fdc30164e7eea1ee"; - name = "ipfs-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/ipfs/go-ipfs"; - - src = fetchFromGitHub { - inherit rev; - owner = "ipfs"; - repo = "go-ipfs"; - sha256 = "1mlilx1i77px85jag4jwpcy8fy0vv15hsmpr1d9zvcs3b7qhskqp"; - }; + ipfs = buildFromGitHub{ + rev = "ff26c312000da12d395c9cdba05c43f29b68b456"; + owner = "ipfs"; + repo = "go-ipfs"; + sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg"; + disabled = !isGo14; }; ldap = buildGoPackage rec { @@ -1567,11 +1574,9 @@ let levigo = buildGoPackage rec { rev = "1ddad808d437abb2b8a55a950ec2616caa88969b"; - name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; + name = "levigo-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/jmhodges/levigo"; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "jmhodges"; @@ -1614,8 +1619,6 @@ let "code.google.com/p/log4go" ]; - excludedPackages = "examples"; - src = fetchFromGitHub { inherit rev; owner = "ccpaging"; @@ -1626,20 +1629,19 @@ let propagatedBuildInputs = [ go-colortext ]; }; - logrus = buildGoPackage rec { - rev = "v0.8.2"; - name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/Sirupsen/logrus"; - - excludedPackages = "examples"; - - src = fetchFromGitHub { - inherit rev; - owner = "Sirupsen"; - repo = "logrus"; - sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv"; - }; + logger = buildFromGitHub { + rev = "c96f6a1a8c7b6bf2f4860c667867d90174799eb2"; + date = "2015-05-23"; + owner = "calmh"; + repo = "logger"; + sha256 = "1f67xbvvf210g5cqa84l12s00ynfbkjinhl8y6m88yrdb025v1vg"; + }; + logrus = buildFromGitHub rec { + rev = "v0.8.6"; + owner = "Sirupsen"; + repo = "logrus"; + sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa"; propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ]; }; @@ -1650,16 +1652,29 @@ let sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; }; + luhn = buildFromGitHub { + rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; + date = "2015-01-13"; + owner = "calmh"; + repo = "luhn"; + sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; + }; + lxd = buildFromGitHub { rev = "22fec6bb6bb5988eb0f1b3532a02ebacfb26cf47"; date = "2015-08-05"; owner = "lxc"; repo = "lxd"; sha256 = "1n7fhzl6vrn82r3cqpgqpgq5d5142rnk1cp7vig38323n2yh3749"; + excludedPackages = "test"; # Don't build the binary called test which causes conflicts buildInputs = [ gettext-go websocket crypto log15 go-lxc yaml-v2 tomb protobuf pongo2 lxd-go-systemd go-uuid tablewriter golang-petname mux go-sqlite3 goproxy + pkgs.python3 ]; + postInstall = '' + cp go/src/$goPackagePath/scripts/lxd-images $bin/bin + ''; }; mapstructure = buildFromGitHub { @@ -1714,6 +1729,27 @@ let propagatedBuildInputs = [ ugorji.go armon.go-metrics ]; }; + mesos-dns = buildFromGitHub { + rev = "v0.1.2"; + owner = "mesosphere"; + repo = "mesos-dns"; + sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; + + # Avoid including the benchmarking test helper in the output: + subPackages = [ "." ]; + + buildInputs = [ glog mesos-go dns go-restful ]; + }; + + mesos-go = buildFromGitHub { + rev = "d98afa618cc9a9251758916f49ce87f9051b69a4"; + owner = "mesos"; + repo = "mesos-go"; + sha256 = "01ab0jf3cfb1rdwwb21r38rcfr5vp86pkfk28mws8298mlzbpri7"; + propagatedBuildInputs = [ gogo.protobuf glog net testify go-zookeeper objx uuid ]; + excludedPackages = "test"; + }; + mesos-stats = buildGoPackage rec { rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; name = "mesos-stats-${stdenv.lib.strings.substring 0 7 rev}"; @@ -1746,13 +1782,14 @@ let # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer - installPhase = '' - mkdir -p $out/bin + preInstall = '' + mkdir -p $bin/bin while read b; do rm -f go/bin/main go install $goPackagePath/$b/main - cp go/bin/main $out/bin/$b + cp go/bin/main $bin/bin/$b done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a) + rm -r go/bin ''; }; @@ -1776,6 +1813,16 @@ let }; }; + mtpfs = buildFromGitHub { + rev = "3ef47f91c38cf1da3e965e37debfc81738e9cd94"; + date = "2015-08-01"; + owner = "hanwen"; + repo = "go-mtpfs"; + sha256 = "1f7lcialkpkwk01f7yxw77qln291sqjkspb09mh0yacmrhl231g8"; + + buildInputs = [ go-fuse usb ]; + }; + mux = buildFromGitHub { rev = "5a8a0400500543e28b2886a8c52d21a435815411"; date = "2015-08-05"; @@ -1814,6 +1861,41 @@ let propagatedBuildInputs = [ ugorji.go ]; }; + ngrok = buildFromGitHub { + rev = "1.7.1"; + owner = "inconshreveable"; + repo = "ngrok"; + sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4"; + goPackagePath = "ngrok"; + + preConfigure = '' + sed -e '/jteeuwen\/go-bindata/d' \ + -e '/export GOPATH/d' \ + -e 's/go get/#go get/' \ + -e 's|bin/go-bindata|go-bindata|' -i Makefile + make assets BUILDTAGS=release + export sourceRoot=$sourceRoot/src/ngrok + ''; + + buildInputs = [ + git log4go websocket go-vhost mousetrap termbox-go rcrowley.go-metrics + yaml-v1 go-bindata.bin go-update-v0 binarydist osext + ]; + + buildFlags = [ "-tags release" ]; + }; + + nsq = buildFromGitHub { + rev = "v0.3.5"; + owner = "bitly"; + repo = "nsq"; + sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; + + excludedPackages = "bench"; + + buildInputs = [ go-nsq go-options semver perks toml go-hostpool timer_metrics ]; + }; + ntp = buildFromGitHub { rev = "0a5264e2563429030eb922f258229ae3fee5b5dc"; owner = "beevik"; @@ -1883,6 +1965,16 @@ let ''; }; + opsgenie-go-sdk = buildFromGitHub { + rev = "c6e1235dfed2126eb9b562c4d776baf55ccd23e3"; + date = "2015-08-24"; + owner = "opsgenie"; + repo = "opsgenie-go-sdk"; + sha256 = "1prvnjiqmhnp9cggp9f6882yckix2laqik35fcj32117ry26p4jm"; + propagatedBuildInputs = [ seelog go-querystring goreq ]; + excludedPackages = "samples"; + }; + osext = buildFromGitHub { rev = "6e7f843663477789fac7c02def0d0909e969b4e5"; owner = "kardianos"; @@ -1923,13 +2015,6 @@ let propagatedBuildInputs = [ osext ]; }; - perks = buildFromGitHub { - rev = "aac9e2eab5a334037057336897fd10b0289a5ae8"; - owner = "bmizerany"; - repo = "perks"; - sha256 = "1d027jgc327qz5xmal0hrpqvsj45i9yqmm9pxk3xp3hancvz3l3k"; - }; - pb = buildFromGitHub { rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; owner = "cheggaaa"; @@ -1937,17 +2022,20 @@ let sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; }; - beorn7.perks = buildGoPackage rec { - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/beorn7/perks"; + perks = buildFromGitHub rec { + date = "2014-07-16"; + owner = "bmizerany"; + repo = "perks"; + rev = "d9a9656a3a4b1c2864fdb44db2ef8619772d92aa"; + sha256 = "0f39b3zfm1zd6xcvlm6szgss026qs84n2j9y5bnb3zxzdkxb9w9n"; + }; - src = fetchFromGitHub { - inherit rev; - owner = "beorn7"; - repo = "perks"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; + beorn7.perks = buildFromGitHub rec { + date = "2015-02-23"; + owner = "beorn7"; + repo = "perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; }; pflag = buildGoPackage rec { @@ -1963,6 +2051,23 @@ let doCheck = false; # bad import path in tests }; + pond = let isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; in buildFromGitHub { + rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2"; + owner = "agl"; + repo = "pond"; + sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; + + buildInputs = [ net crypto protobuf ed25519 pkgs.trousers ] + ++ stdenv.lib.optional isx86_64 pkgs.dclxvi; + buildFlags = "-tags nogui"; + excludedPackages = "\\(appengine\\|bn256cgo\\)"; + postPatch = stdenv.lib.optionalString isx86_64 '' + grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ + -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ + -e "s,bn256\.,bn256cgo.,g" + ''; + }; + pongo2 = buildFromGitHub { rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; date = "2014-10-27"; @@ -2005,11 +2110,49 @@ let propagatedBuildInputs = [ kr.text ]; }; + prometheus.alertmanager = buildGoPackage rec { + name = "prometheus-alertmanager-${rev}"; + rev = "0.0.4"; + goPackagePath = "github.com/prometheus/alertmanager"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "alertmanager"; + inherit rev; + sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15"; + }; + + buildInputs = [ + fsnotify.v0 + httprouter + prometheus.client_golang + prometheus.log + pushover + ]; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion=${rev} + -X main.buildBranch=master + -X main.buildUser=nix@nixpkgs + -X main.buildDate=20150101-00:00:00 + -X main.goVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Alert dispatcher for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/alertmanager; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + prometheus.client_golang = buildFromGitHub { - rev = "3a499bf7fc46bc58337ce612d0cbb29c550b8118"; + rev = "0.7.0"; owner = "prometheus"; repo = "client_golang"; - sha256 = "1hf79m83kr3b6nxxwz8qw1c5nls58j1xfaz7q6k6bb9kwabpc3gi"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; propagatedBuildInputs = [ goautoneg protobuf @@ -2018,48 +2161,295 @@ let prometheus.procfs beorn7.perks ]; - excludedPackages = "examples"; }; - prometheus.client_model = buildGoPackage rec { - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - name = "prometheus-client-model-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/prometheus/client_model"; - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "client_model"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + prometheus.cli = buildFromGitHub { + rev = "0.3.0"; + owner = "prometheus"; + repo = "prometheus_cli"; + sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; + + buildInputs = [ + prometheus.client_model + prometheus.client_golang + ]; + + meta = with stdenv.lib; { + description = "Command line tool for querying the Prometheus HTTP API"; + homepage = https://github.com/prometheus/prometheus_cli; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; }; + }; + + prometheus.client_model = buildFromGitHub { + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + date = "2015-02-12"; + owner = "prometheus"; + repo = "client_model"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; buildInputs = [ protobuf ]; }; - prometheus.log = buildGoPackage rec { - name = "prometheus-log-${version}"; - version = "git-2015-05-29"; - goPackagePath = "github.com/prometheus/log"; - src = fetchFromGitHub { - rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; - owner = "prometheus"; - repo = "log"; - sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + prometheus.collectd-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "collectd_exporter"; + sha256 = "165zsdn0lffb6fvxz75szmm152a6wmia5skb96k1mv59qbmn9fi1"; + buildInputs = [ prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Relay server for exporting metrics from collectd to Prometheus"; + homepage = https://github.com/prometheus/alertmanager; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.haproxy-exporter = buildFromGitHub { + rev = "0.4.0"; + owner = "prometheus"; + repo = "haproxy_exporter"; + sha256 = "0cwls1d4hmzjkwc50mjkxjb4sa4q6yq581wlc5sg9mdvl6g91zxr"; + buildInputs = [ prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "HAProxy Exporter for the Prometheus monitoring system"; + homepage = https://github.com/prometheus/haproxy_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; }; + }; + + prometheus.log = buildFromGitHub { + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + date = "2015-05-29"; + owner = "prometheus"; + repo = "log"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; propagatedBuildInputs = [ logrus ]; }; - prometheus.procfs = buildGoPackage rec { - rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d"; - name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/prometheus/procfs"; + prometheus.mesos-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "mesos_exporter"; + sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; + buildInputs = [ mesos-stats prometheus.client_golang glog ]; + meta = with stdenv.lib; { + description = "Export Mesos metrics to Prometheus"; + homepage = https://github.com/prometheus/mesos_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.mysqld-exporter = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "mysqld_exporter"; + sha256 = "10xnyxyb6saz8pq3ijp424hxy59cvm1b5c9zcbw7ddzzkh1f6jd9"; + buildInputs = [ mysql prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Prometheus exporter for MySQL server metrics"; + homepage = https://github.com/prometheus/mysqld_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.nginx-exporter = buildFromGitHub { + rev = "2cf16441591f6b6e58a8c0439dcaf344057aea2b"; + date = "2015-06-01"; + owner = "discordianfish"; + repo = "nginx_exporter"; + sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; + buildInputs = [ prometheus.client_golang prometheus.log ]; + meta = with stdenv.lib; { + description = "Metrics relay from nginx stats to Prometheus"; + homepage = https://github.com/discordianfish/nginx_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.node-exporter = buildFromGitHub { + rev = "0.10.0"; + owner = "prometheus"; + repo = "node_exporter"; + sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p"; + + buildInputs = [ + go-runit + ntp + prometheus.client_golang + prometheus.client_model + prometheus.log + protobuf + ]; + + meta = with stdenv.lib; { + description = "Prometheus exporter for machine metrics"; + homepage = https://github.com/prometheus/node_exporter; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.procfs = buildFromGitHub { + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + date = "2015-06-16"; + owner = "prometheus"; + repo = "procfs"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + + prometheus.prom2json = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "prom2json"; + sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; + + buildInputs = [ + golang_protobuf_extensions + prometheus.client_golang + protobuf + ]; + + meta = with stdenv.lib; { + description = "Tool to scrape a Prometheus client and dump the result as JSON"; + homepage = https://github.com/prometheus/prom2json; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.prometheus = buildGoPackage rec { + name = "prometheus-${version}"; + version = "0.15.1"; + goPackagePath = "github.com/prometheus/prometheus"; + rev = "64349aade284846cb194be184b1b180fca629a7c"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; - repo = "procfs"; - sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff"; + repo = "prometheus"; + sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2"; + }; + + buildInputs = [ + consul + dns + fsnotify.v1 + go-zookeeper + goleveldb + httprouter + logrus + net + prometheus.client_golang + prometheus.log + yaml-v2 + ]; + + preInstall = '' + mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" + cp -a $src/documentation/* $bin/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + ''; + + # Metadata that gets embedded into the binary + buildFlagsArray = let t = "${goPackagePath}/version"; in + '' + -ldflags= + -X ${t}.Version=${version} + -X ${t}.Revision=${builtins.substring 0 6 rev} + -X ${t}.Branch=master + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=20150101-00:00:00 + -X ${t}.GoVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Service monitoring system and time series database"; + homepage = http://prometheus.io; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + prometheus.pushgateway = buildFromGitHub rec { + rev = "0.1.1"; + owner = "prometheus"; + repo = "pushgateway"; + sha256 = "17q5z9msip46wh3vxcsq9lvvhbxg75akjjcr2b29zrky8bp2m230"; + + buildInputs = [ + protobuf + httprouter + golang_protobuf_extensions + prometheus.client_golang + ]; + + nativeBuildInputs = [ go-bindata.bin ]; + preBuild = '' + ( + cd "go/src/$goPackagePath" + go-bindata ./resources/ + ) + ''; + + buildFlagsArray = '' + -ldflags= + -X main.buildVersion=${rev} + -X main.buildRev=${rev} + -X main.buildBranch=master + -X main.buildUser=nix@nixpkgs + -X main.buildDate=20150101-00:00:00 + -X main.goVersion=${stdenv.lib.getVersion go} + ''; + + meta = with stdenv.lib; { + description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; + homepage = https://github.com/prometheus/pushgateway; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; }; }; + prometheus.statsd-bridge = buildFromGitHub { + rev = "0.1.0"; + owner = "prometheus"; + repo = "statsd_bridge"; + sha256 = "1fndpmd1k0a3ar6f7zpisijzc60f2dng5399nld1i1cbmd8jybjr"; + buildInputs = [ fsnotify.v0 prometheus.client_golang ]; + meta = with stdenv.lib; { + description = "Receives StatsD-style metrics and exports them to Prometheus"; + homepage = https://github.com/prometheus/statsd_bridge; + license = licenses.asl20; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; + }; + + gogo.protobuf = buildFromGitHub { + rev = "932b70afa8b0bf4a8e167fdf0c3367cebba45903"; + owner = "gogo"; + repo = "protobuf"; + sha256 = "1djhv9ckqhyjnnqajjv8ivcwpmjdnml30l6zhgbjcjwdyz3nyzhx"; + excludedPackages = "test"; + goPackageAliases = [ + "code.google.com/p/gogoprotobuf" + ]; + }; + pty = buildFromGitHub { rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; owner = "kr"; @@ -2074,6 +2464,13 @@ let sha256 = "0j4k43ppka20hmixlwhhz5mhv92p6wxbkvdabs4cf7k8jpk5argq"; }; + qart = buildFromGitHub { + rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; + owner = "vitrun"; + repo = "qart"; + sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; + }; + raft = buildGoPackage rec { rev = "a8065f298505708bf60f518c09178149f3c06f21"; name = "raft-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2119,6 +2516,14 @@ let propagatedBuildInputs = [ gomdb ugorji.go raft ]; }; + ratelimit = buildFromGitHub { + rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; + date = "2015-06-19"; + owner = "juju"; + repo = "ratelimit"; + sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; + }; + raw = buildFromGitHub { rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4"; owner = "feyeleanor"; @@ -2127,10 +2532,11 @@ let }; raven-go = buildFromGitHub { - rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7"; + rev = "74c334d7b8aaa4fd1b4fc6aa428c36fed1699e28"; + date = "2015-07-21"; owner = "getsentry"; repo = "raven-go"; - sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh"; + sha256 = "1356a7h8zp1mcywnr0y83w0h4qdblp65rcf9slbx667n8x2rzda8"; }; redigo = buildFromGitHub { @@ -2140,6 +2546,14 @@ let sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; }; + relaysrv = buildFromGitHub { + rev = "7fe1fdd8c751df165ea825bc8d3e895f118bb236"; + owner = "syncthing"; + repo = "relaysrv"; + sha256 = "0qy14pa0z2dq5mix5ylv2raabwxqwj31g5kkz905wzki6d4j5lnp"; + buildInputs = [ xdr syncthing-protocol ratelimit syncthing-lib ]; + }; + reflectwalk = buildFromGitHub { rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6"; owner = "mitchellh"; @@ -2210,17 +2624,28 @@ let buildInputs = [ armon.go-metrics net-rpc-msgpackrpc yamux ]; }; - serf = buildGoPackage rec { - rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; - name = "serf-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hashicorp/serf"; + seelog = buildFromGitHub { + rev = "c510775bb50d98213cfafca75a4bc5e3fddc8d8f"; + date = "2015-05-26"; + owner = "cihub"; + repo = "seelog"; + sha256 = "1f0rwgqlffv1a7b05736a4gf4l9dn80wsfyqcnz6qd2skhwnzv29"; + }; - src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "serf"; - sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; - }; + semver = buildFromGitHub { + rev = "31b736133b98f26d5e078ec9eb591666edfd091f"; + date = "2015-07-20"; + owner = "blang"; + repo = "semver"; + sha256 = "19ifi0na4cj23q3h8xv89mx7p48y0ciymhmlrq9milm0xz80wk10"; + }; + + serf = buildFromGitHub { + rev = "668982d8f90f5eff4a766583c1286393c1d27f68"; + date = "2015-05-15"; + owner = "hashicorp"; + repo = "serf"; + sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; buildInputs = [ circbuf armon.go-metrics ugorji.go go-syslog logutils mdns memberlist @@ -2241,6 +2666,17 @@ let propagatedBuildInputs = [ slices ]; }; + skydns = buildFromGitHub { + rev = "2.5.2b"; + owner = "skynetservices"; + repo = "skydns"; + sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv"; + + buildInputs = [ + go-etcd rcrowley.go-metrics dns go-systemd prometheus.client_golang + ]; + }; + slices = buildGoPackage rec { rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea"; name = "slices-${stdenv.lib.strings.substring 0 7 rev}"; @@ -2303,6 +2739,40 @@ let sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"; }; + suture = buildFromGitHub { + rev = "fc7aaeabdc43fe41c5328efa1479ffea0b820978"; + owner = "thejerf"; + repo = "suture"; + sha256 = "1l7nw00pazp317n5nprrxwhcq56kdblc774lsznxmbb30xcp8nmf"; + }; + + syncthing = buildFromGitHub { + rev = "v0.11.23"; + owner = "syncthing"; + repo = "syncthing"; + sha256 = "06a5b68fq440xcysba65xbpr3zd4yhp7y1x6a11n5bx0rpxa4jzi"; + doCheck = true; + buildInputs = [ + go-lz4 du luhn xdr snappy ratelimit osext syncthing-protocol relaysrv + goleveldb suture qart crypto net text + ]; + }; + + syncthing-lib = buildFromGitHub { + inherit (syncthing) rev owner repo sha256; + subPackages = [ "lib/sync" ]; + buildInputs = [ logger ]; + }; + + syncthing-protocol = buildFromGitHub { + rev = "84365882de255d2204d0eeda8dee288082a27f98"; + date = "2015-08-28"; + owner = "syncthing"; + repo = "protocol"; + sha256 = "07xjs43lpd51pc339f8x487yhs39riysj3ifbjxsx329kljbflwx"; + propagatedBuildInputs = [ go-lz4 logger luhn xdr text ]; + }; + tablewriter = buildFromGitHub { rev = "bc39950e081b457853031334b3c8b95cdfe428ba"; date = "2015-06-03"; @@ -2353,6 +2823,14 @@ let propagatedBuildInputs = [ pty ]; }; + timer_metrics = buildFromGitHub { + rev = "afad1794bb13e2a094720aeb27c088aa64564895"; + date = "2015-02-02"; + owner = "bitly"; + repo = "timer_metrics"; + sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; + }; + tomb = buildFromGitHub { rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; owner = "go-tomb"; @@ -2364,23 +2842,29 @@ let toml = buildFromGitHub { rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + date = "2015-05-01"; owner = "BurntSushi"; repo = "toml"; sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; }; - usb = buildGoPackage rec { + usb = buildFromGitHub rec { rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; - name = "usb-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hanwen/usb"; - src = fetchFromGitHub { - inherit rev; - owner = "hanwen"; - repo = "usb"; - sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; - }; + date = "2014-12-17"; + owner = "hanwen"; + repo = "usb"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.libusb ]; + buildInputs = [ pkgs.libusb1 ]; + }; + + uuid = buildFromGitHub { + rev = "cccd189d45f7ac3368a0d127efb7f4d08ae0b655"; + date = "2015-08-24"; + owner = "pborman"; + repo = "uuid"; + sha256 = "0hswk9ihv3js5blp9pk2bpig64zkmyp5p1zhmgydfhb0dr2w8iad"; }; vault = buildFromGitHub { @@ -2462,6 +2946,14 @@ let sha256 = "0mr87my5m8lgc0byjcddlclxg34d07cpi9p78ps3rhzq7p37g533"; }; + xdr = buildFromGitHub { + rev = "5f7208e86762911861c94f1849eddbfc0a60cbf0"; + date = "2015-04-08"; + owner = "calmh"; + repo = "xdr"; + sha256 = "18m8ms2kg4apj5772r317i3axklgci8x1pq3pgicsv3acmpclh47"; + }; + xon = buildFromGitHub { rev = "d580be739d723da4f6378083128f93017b8ab295"; owner = "odeke-em"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 43fc9976ec7b..cb8c53ad06c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -31,10 +31,7 @@ rec { ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix ({ ghc = compiler.ghc742Binary; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); - ghc7101 = callPackage ../development/compilers/ghc/7.10.1.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { - libiconv = pkgs.darwin.libiconv; - }); - ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; } // stdenv.lib.optionalAttrs stdenv.isDarwin { + ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix ({ ghc = compiler.ghc784; inherit (packages.ghc784) hscolour; } // stdenv.lib.optionalAttrs stdenv.isDarwin { libiconv = pkgs.darwin.libiconv; }); ghcHEAD = callPackage ../development/compilers/ghc/head.nix ({ inherit (packages.ghc784) ghc alex happy; } // stdenv.lib.optionalAttrs stdenv.isDarwin { @@ -86,10 +83,6 @@ rec { ghc = compiler.ghc784; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.8.x.nix { }; }; - ghc7101 = callPackage ../development/haskell-modules { - ghc = compiler.ghc7101; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; ghc7102 = callPackage ../development/haskell-modules { ghc = compiler.ghc7102; packageSetConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0253bfa8d6e4..c24348249a40 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5469,6 +5469,14 @@ let self = _self // overrides; _self = with self; { }; }; + IOTee = buildPerlPackage rec { + name = "IO-Tee-0.64"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KE/KENSHAN/${name}.tar.gz"; + sha256 = "1mjy6hmwrzipzxcm33qs7ja89ljk6zkk499wclw16lfkqaqpdliy"; + }; + }; + IOTieCombine = buildPerlPackage { name = "IO-TieCombine-1.004"; src = fetchurl { @@ -11768,6 +11776,7 @@ let self = _self // overrides; _self = with self; { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; + broken = true; # tests fail http://hydra.nixos.org/build/25141764/nixlog/1/raw }; buildInputs = [ pkgs.icu ]; }; @@ -11797,6 +11806,14 @@ let self = _self // overrides; _self = with self; { }; }; + UnicodeString = buildPerlPackage rec { + name = "Unicode-String-2.09"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz"; + sha256 = "1bgsaf3dgmlgyvi84r42ysc037mr5280amnypa4d98jfjpdvw5y8"; + }; + }; + UnixGetrusage = buildPerlPackage { name = "Unix-Getrusage-0.03"; src = fetchurl { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9fc605be1e3e..e9f2d145226e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -12,6 +12,13 @@ let self = with self; { sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp"; }; + imagick = buildPecl { + name = "imagick-3.1.2"; + sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; + configureFlags = "--with-imagick=${pkgs.imagemagick}"; + buildInputs = [ pkgs.pkgconfig ]; + }; + memcache = buildPecl { name = "memcache-3.0.8"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ca2454e981b9..417a31d1ab30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -963,16 +963,13 @@ let }); beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.1.3"; + name = "beautifulsoup4-4.4.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/b/beautifulsoup4/${name}.tar.gz"; - md5 = "f1481ed77336de77a2d8e5b061b6ad62"; + sha256 = "1xhp57nr7aapn55wpk7i2kcv2cdamcn1parrm6dqnhv9iyl1vngs"; }; - # invalid command 'test' - doCheck = false; - meta = { homepage = http://crummy.com/software/BeautifulSoup/bs4/; description = "HTML and XML parser"; @@ -981,7 +978,6 @@ let }; }); - beaker = buildPythonPackage rec { name = "Beaker-1.6.4"; @@ -1090,6 +1086,29 @@ let propagatedBuildInputs = with self; [ boto crcmod psutil ]; }; + cgroup-utils = buildPythonPackage rec { + version = "0.6"; + name = "cgroup-utils-${version}"; + + propagatedBuildInputs = with self; [ argparse ]; + buildInputs = with self; [ pep8 nose ]; + # Pep8 tests fail... + doCheck = false; + + src = pkgs.fetchFromGitHub { + owner = "peo3"; + repo = "cgroup-utils"; + rev = "v${version}"; + sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; + }; + + meta = { + description = "Utility tools for control groups of Linux"; + maintainers = with maintainers; [ layus ]; + license = licenses.gpl2; + }; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; @@ -1484,12 +1503,12 @@ let }; botocore = buildPythonPackage rec { - version = "1.1.4"; + version = "1.1.10"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - sha256 = "1wbbaj0y6bfzsh61hgnnssn5j8m93r6r2m5r1jmlf6iz3l9gqkkp"; + sha256 = "0syj0m0l7k4wa0n9h7h8ywayjv9fgpn5wyzpdriws0j417y1zlyc"; }; propagatedBuildInputs = @@ -2249,11 +2268,11 @@ let cython = buildPythonPackage rec { name = "Cython-${version}"; - version = "0.22.1"; + version = "0.23.1"; src = pkgs.fetchurl { url = "http://www.cython.org/release/${name}.tar.gz"; - sha256 = "7fff120e65e7b66edb4a42823f5642bad3bc1e5601bf882d66aee50248cf0682"; + sha256 = "12h1g21xmp2jk8j3sw2i73ffxgfafakza6mw3fd4pqx2lbb15zdx"; }; setupPyBuildFlags = ["--build-base=$out"]; @@ -2727,6 +2746,24 @@ let }; }); + dask = buildPythonPackage rec { + name = "dask-${version}"; + version = "0.7.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dask/${name}.tar.gz"; + sha256 = "3b48646e9e66ec21a6885700d39ea90e2c2a7ad5d26773a8413b570eb1a67b3e"; + }; + + propagatedBuildInputs = with self; [numpy toolz dill]; + + meta = { + description = "Minimal task scheduling abstraction"; + homepage = "http://github.com/ContinuumIO/dask/"; + licenses = licenses.bsd3; + }; + }; + datashape = buildPythonPackage rec { name = "datashape-${version}"; version = "0.4.6"; @@ -2954,6 +2991,24 @@ let }; }; + dill = buildPythonPackage rec { + name = "dill-${version}"; + version = "0.2.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dill/${name}.tgz"; + sha256 = "deca57da33ad2121ab1b9c4493bf8eb2b3a72b6426d4b9a3a853a073c68b97ca"; + }; + + propagatedBuildInputs = with self; [objgraph]; + + meta = { + description = "Serialize all of python (almost)"; + homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm; + license = licenses.bsd3; + }; + }; + discogs_client = buildPythonPackage rec { name = "discogs-client-2.0.2"; @@ -3226,6 +3281,21 @@ let }; }; + easy-process = buildPythonPackage rec { + name = "EasyProcess-0.1.9"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/E/EasyProcess/${name}.tar.gz"; + md5 = "3da72e2fe16781fe5c7b3b0c6c40ee7b"; + }; + + meta = { + description = "Easy to use python subprocess interface"; + homepage = "https://github.com/ponty/EasyProcess"; + licenses = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; elasticsearch = buildPythonPackage (rec { name = "elasticsearch-1.6.0"; @@ -3520,24 +3590,39 @@ let gcutil = buildPythonPackage rec { name = "gcutil-1.16.1"; - meta.maintainers = with maintainers; [ phreedom ]; src = pkgs.fetchurl { url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x"; }; + propagatedBuildInputs = with self; [ + gflags + iso8601 + ipaddr + httplib2 + google_apputils + google_api_python_client + ]; + prePatch = '' + sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py substituteInPlace setup.py \ --replace "httplib2==0.8" "httplib2" \ --replace "iso8601==0.1.4" "iso8601" ''; - propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ]; + meta = { + description = "Command-line tool for interacting with Google Compute Engine."; + homepage = "https://cloud.google.com/compute/docs/gcutil/"; + license = licenses.asl20; + maintainers = with maintainers; [ phreedom ]; + }; }; gmpy = buildPythonPackage rec { name = "gmpy-1.17"; + disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip"; @@ -3557,6 +3642,7 @@ let gmpy2 = buildPythonPackage rec { name = "gmpy2-2.0.6"; + disabled = isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip"; @@ -3942,6 +4028,29 @@ let }; }; + lti = buildPythonPackage rec { + version = "0.4.0"; + name = "PyLTI-${version}"; + + propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ]; + buildInputs = with self; [ + flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore + pytestflakes pytestpep8 sphinx mock + ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyLTI/${name}.tar.gz"; + sha256 = "1lkk6qx8yfx1h0rhi4abnd44x0wakggi6zs0nvi572lajf6ydmdh"; + }; + + meta = { + description = "Implementation of IMS LTI interface that works with edX"; + homepage = "https://github.com/mitodl/pylti"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; @@ -4311,6 +4420,25 @@ let }; }; + pirate-get = pythonPackages.buildPythonPackage rec { + name = "pirate-get-${version}"; + version = "0.2.7"; + + disabled = !isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pirate-get/${name}.tar.gz"; + sha256 = "0awjrmczvd6rwzj4fb7bhjlil5mx91amjs7fk5890h3in52clxg3"; + }; + + propagatedBuildInputs = [ self.colorama ]; + + meta = { + description = "A command line interface for The Pirate Bay"; + homepage = https://github.com/vikstrous/pirate-get; + license = licenses.gpl1; + }; + }; poppler-qt4 = buildPythonPackage rec { name = "poppler-qt4-${version}"; @@ -5354,6 +5482,24 @@ let }; }; + djangorestframework = buildPythonPackage rec { + name = "djangorestframework-${version}"; + version = "3.2.3"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/djangorestframework/${name}.tar.gz"; + sha256 = "06kp4hg3y4bqy2ixlb1q6bw81gwgsb86l4lanbav7bp1grrbbnj1"; + }; + + propagatedBuildInputs = with self; [ django ]; + + meta = { + description = "Web APIs for Django, made easy"; + homepage = http://www.django-rest-framework.org/; + maintainers = with maintainers; [ desiderius ]; + license = licenses.bsd2; + }; + }; django_reversion = buildPythonPackage rec { name = "django-reversion-${version}"; @@ -5375,6 +5521,24 @@ let }; }; + django_treebeard = buildPythonPackage rec { + name = "django-treebeard-${version}"; + version = "3.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/django-treebeard/${name}.tar.gz"; + sha256 = "10p9rb2m1zccszg7590fjd0in6rabzsh86f5m7qm369mapc3b6dc"; + }; + + propagatedBuildInputs = with self; [ django pytest ]; + + meta = { + description = "Efficient tree implementations for Django 1.6+"; + homepage = https://tabo.pe/projects/django-treebeard/; + maintainers = with maintainers; [ desiderius ]; + license = licenses.asl20; + }; + }; django_pipeline = buildPythonPackage rec { name = "django-pipeline-${version}"; @@ -5676,7 +5840,7 @@ let pyfribidi = buildPythonPackage rec { version = "0.11.0"; name = "pyfribidi-${version}"; - disabled = isPy3k; + disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip"; @@ -6091,7 +6255,7 @@ let ''; homepage = http://github.com/terencehonles/fusepy; license = licenses.isc; - platforms = with platforms; linux; + platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; }; }; @@ -6192,7 +6356,7 @@ let ''; homepage = https://github.com/dsoprea/GDriveFS; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = platforms.unix; maintainers = with maintainers; [ nckx ]; }; }; @@ -6246,7 +6410,7 @@ let description = "Coroutine-based networking library"; homepage = http://www.gevent.org/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; }; @@ -6810,14 +6974,16 @@ let }; }; - importlib = if isPy26 then (buildPythonPackage { + importlib = buildPythonPackage rec { name = "importlib-1.0.2"; + + disabled = (!isPy26) || isPyPy; + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; md5 = "4aa23397da8bd7c7426864e88e4db7e1"; }; - doCheck = false; - }) else null; + }; influxdb = buildPythonPackage rec { name = "influxdb-0.1.12"; @@ -6862,6 +7028,60 @@ let }; }; + inginious = buildPythonPackage rec { + version = "0.3.dev1"; + name = "inginious-${version}"; + + disabled = isPy3k; + + # patched version of docker bindings. + docker-custom = self.docker.override { + name = "docker-1.3.0-dirty"; + src = pkgs.fetchFromGitHub { + owner = "GuillaumeDerval"; + repo = "docker-py"; + rev = "1.3.0-dev"; + sha256 = "0rx686riw4w6kanw4nsyzhcy84fz251g9x59piba2n62qpa1rlxf"; + }; + }; + + propagatedBuildInputs = with self; [ + requests2 # Needs to be first; + cgroup-utils docker-custom docutils lti multiprocessing pygments pymongo + pyyaml rpyc selenium sh simpleldap tidylib virtual-display web + websocket_client + ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/I/INGInious/INGInious-${version}.tar.gz"; + md5 = "40474dd6b6d4fc26e47a1d9c77bcf943"; + }; + + meta = { + description = "An intelligent grader that allows secured and automated testing of code made by students."; + homepage = "https://github.com/UCL-INGI/INGInious"; + license = licenses.agpl3; + maintainers = with maintainers; [ layus ]; + }; + }; + + interruptingcow = buildPythonPackage rec { + name = "interruptingcow-${version}"; + version = "0.6"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/interruptingcow/${name}.tar.gz"; + sha256 = "1cv4pm2h0f87n9w4r3l1f96skwmng95sawn7j00ns0rdp1zshr9d"; + }; + + meta = { + description = "A watchdog that interrupts long running code"; + homepage = https://bitbucket.org/evzijst/interruptingcow; + license = licenses.mit; + maintainers = with maintainers; [ benley ]; + }; + }; + iptools = buildPythonPackage rec { version = "0.6.1"; name = "iptools-${version}"; @@ -7221,6 +7441,33 @@ let }; + jsonpath_rw = buildPythonPackage rec { + name = "jsonpath-rw-${version}"; + version = "1.4.0"; + disabled = isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonpath-rw/${name}.tar.gz"; + md5 = "3a807e05c2c12158fc6bb0a402fd5778"; + }; + + propagatedBuildInputs = with self; [ + ply + six + decorator + ]; + + # ImportError: No module named tests + doCheck = false; + + meta = { + homepage = https://github.com/kennknowles/python-jsonpath-rw; + description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; + license = licenses.asl20; + }; + }; + + keyring = buildPythonPackage rec { name = "keyring-3.3"; @@ -7242,16 +7489,16 @@ let }; klaus = buildPythonPackage rec { - version = "0.4.10"; + version = "0.6.0"; name = "klaus-${version}"; src = pkgs.fetchurl { url = "https://github.com/jonashaag/klaus/archive/${version}.tar.gz"; - sha256 = "1yq1dz3cd2qdn8vi1ivf6biab76cfmcvis07d6a8039w5wxdzc80"; + sha256 = "0ab3lxbysnvsx7irlxhiy78clbk4d0gzv2241pqkkvlmqq3968p4"; }; propagatedBuildInputs = with self; - [ humanize httpauth dulwich pygments flask ]; + [ humanize httpauth dulwich pygments flask six ]; meta = { description = "The first Git web viewer that Just Works"; @@ -7655,6 +7902,41 @@ let }; + mathics = buildPythonPackage rec { + name = "mathics-${version}"; + version = "0.8"; + src = pkgs.fetchFromGitHub { + owner = "mathics"; + repo = "Mathics"; + rev = "v${version}"; + sha256 = "1hyrxnhxw35vn00k55hp9bkg8vg4dsphrpfg1yg4cn53y78rk1im"; + }; + + buildInputs = with self; [ pexpect ]; + + propagatedBuildInputs = with self; [ + argparse + cython + colorama + dateutil + django_1_6 + mpmath + readline + interruptingcow + ply + sqlite3 + sympy + ]; + + meta = { + description = "A general-purpose computer algebra system"; + homepage = http://www.mathics.org; + license = licenses.gpl3; + maintainers = [ maintainers.benley ]; + }; + }; + + matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; @@ -8027,11 +8309,11 @@ let }; mpmath = buildPythonPackage rec { - name = "mpmath-0.17"; + name = "mpmath-0.19"; src = pkgs.fetchurl { - url = "https://mpmath.googlecode.com/files/${name}.tar.gz"; - sha256 = "1blgzwq4irzaf8abb4z0d2r48903n9zxf51fhnv3gv09bgxjqzxh"; + url = "https://pypi.python.org/packages/source/m/mpmath/${name}.tar.gz"; + sha256 = "08ijsr4ifrqv3cjc26mkw0dbvyygsa99in376hr4b96ddm1gdpb8"; }; meta = { @@ -8129,6 +8411,15 @@ let }; }; + multiprocessing = buildPythonPackage rec { + name = "multiprocessing-2.6.2.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/multiprocessing/${name}.tar.gz"; + md5 = "5cc484396c040102116ccc2355379c72"; + }; + }; + munkres = buildPythonPackage rec { name = "munkres-1.0.6"; @@ -8579,10 +8870,16 @@ let modules.sqlite3 ]; + # Test does not work on Py3k because it calls 'python'. + # https://github.com/nipy/nibabel/issues/341 + preCheck = '' + rm nisext/tests/test_testers.py + ''; + meta = { homepage = http://nipy.org/nibabel/; description = "Access a multitude of neuroimaging data formats"; - license = "BSD"; + license = licenses.mit; }; }; @@ -8657,10 +8954,10 @@ let nose2 = if isPy26 then null else (buildPythonPackage rec { - name = "nose2-0.4.5"; + name = "nose2-0.5.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/n/nose2/${name}.tar.gz"; - md5 = "d7e51c848227488e3cc0424faf5511cd"; + sha256 = "0595rh6b6dncbj0jigsyrgrh6h8fsl6w1fr69h76mxv9nllv0rlr"; }; meta = { description = "nose2 is the next generation of nicer testing for Python"; @@ -9044,6 +9341,27 @@ let }; }); + objgraph = buildPythonPackage rec { + name = "objgraph-${version}"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/objgraph/${name}.tar.gz"; + sha256 = "841de52715774ec1d0e97d9b4462d6e3e10406155f9b61f54ba7db984c45442a"; + }; + + # Tests fail with PyPy. + disabled = isPyPy; + + propagatedBuildInputs = with self; [pkgs.graphviz]; + + meta = { + description = "Draws Python object reference graphs with graphviz"; + homepage = http://mg.pov.lt/objgraph/; + license = licenses.mit; + }; + }; + odo = buildPythonPackage rec { name = "odo-${version}"; version= "0.3.3"; @@ -9133,11 +9451,11 @@ let }; ply = buildPythonPackage (rec { - name = "ply-3.4"; + name = "ply-3.7"; src = pkgs.fetchurl { url = "http://www.dabeaz.com/ply/${name}.tar.gz"; - sha256 = "0sslnbpws847r1j1f41fjpn76w0asywfqgxwzyjrvmmxnw8myhxg"; + sha256 = "105gw1xayqww99qsls0lv37z4hzg5qnglxkd7s3h96hw9jsbfpzq"; }; meta = { @@ -9183,6 +9501,25 @@ let }); + oslosphinx = buildPythonPackage rec { + name = "oslosphinx-3.1.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/o/oslosphinx/${name}.tar.gz"; + md5= "4fcac44bd6ef174586307a1508ff228f"; + }; + + doCheck = false; + + buildInputs = with self; [ + pbr requests2 + (sphinx.override {src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/sphinx/sphinx-1.2.3.tar.gz"; + sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; + };}) + ]; + }; + pagerduty = buildPythonPackage rec { name = "pagerduty-${version}"; version = "0.2.1"; @@ -9454,19 +9791,18 @@ let }; pbr = buildPythonPackage rec { - name = "pbr-0.9.0"; + name = "pbr-1.6.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pbr/${name}.tar.gz"; - sha256 = "e5a57c434b1faa509a00bf458d2c7af965199d9cced3d05a547bff9880f7e8cb"; + sha256 = "1lg1klrczvzfan89y3bl9ykrknl3nb01vvai37fkww24apzyibjf"; }; - # pip depend on $HOME setting - preConfigure = "export HOME=$TMPDIR"; - doCheck = false; - buildInputs = with self; [ pip ]; + propagatedBuildInputs = with self; [ pip ]; + buildInputs = with self; [ virtualenv ] + ++ stdenv.lib.optional doCheck testtools; meta = { description = "Python Build Reasonableness"; @@ -9477,14 +9813,14 @@ let pelican = buildPythonPackage rec { name = "pelican-${version}"; - version = "3.6.0"; + version = "3.6.3"; disabled = isPy26; src = pkgs.fetchFromGitHub { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "0a9r90d85rn2cvl6yyk6q5i5kwz9igfj8fdwi37zsx4ijhmn2b5j"; + sha256 = "1k572anw39rws67mvxl2w6y93y8w8q5smnwc0dd2gnnr16cc2vsh"; }; buildInputs = with self; [ @@ -9626,10 +9962,10 @@ let pgcli = buildPythonPackage rec { name = "pgcli-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = pkgs.fetchFromGitHub { - sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj"; + sha256 = "1xl3yqwksnszd2vcgzb576m56613qcl82jfqmb9fbvcqlcpks6ln"; rev = "v${version}"; repo = "pgcli"; owner = "dbcli"; @@ -9639,10 +9975,6 @@ let click configobj prompt_toolkit psycopg2 pygments sqlparse ]; - postPatch = '' - substituteInPlace setup.py --replace "==" ">=" - ''; - meta = { inherit version; description = "Command-line interface for PostgreSQL"; @@ -9658,17 +9990,17 @@ let mycli = buildPythonPackage rec { name = "mycli-${version}"; - version = "1.3.0"; + version = "1.4.0"; src = pkgs.fetchFromGitHub { - sha256 = "109jz84m29v4fjhk2ngsfc1b6zw4w6dbjlr2izvib63ylcz7b5nh"; + sha256 = "175jcfixjkq17fbda9kifbljfd5iwjpjisvhs5xhxsyf6n5ykv2l"; rev = "v${version}"; repo = "mycli"; owner = "dbcli"; }; propagatedBuildInputs = with self; [ - pymysql configobj sqlparse prompt_toolkit0_45 pygments click + pymysql configobj sqlparse prompt_toolkit pygments click ]; meta = { @@ -9876,13 +10208,13 @@ let }; plumbum = buildPythonPackage rec { - name = "plumbum-1.4.2"; + name = "plumbum-1.5.0"; buildInputs = with self; [ self.six ]; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/plumbum/${name}.tar.gz"; - md5 = "38b526af9012a5282ae91dfe372cefd3"; + sha256 = "b759f9e3b6771dff3332f01bc0683d1a56218f44d97942dabd906a0cd1cfb756"; }; }; @@ -10018,36 +10350,10 @@ let prompt_toolkit = buildPythonPackage rec { name = "prompt_toolkit-${version}"; - version = "0.47"; + version = "0.46"; src = pkgs.fetchurl { - sha256 = "1xkrbz7d2mzd5r5a8aqbnhym57fkpri9x73cql5vb573glzwddla"; - url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; - }; - - buildInputs = with self; [ jedi ipython pygments ]; - propagatedBuildInputs = with self; [ docopt six wcwidth ]; - - meta = { - description = "Python library for building powerful interactive command lines"; - longDescription = '' - prompt_toolkit could be a replacement for readline, but it can be - much more than that. It is cross-platform, everything that you build - with it should run fine on both Unix and Windows systems. Also ships - with a nice interactive Python shell (called ptpython) built on top. - ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; - license = licenses.bsd3; - maintainers = with maintainers; [ nckx ]; - }; - }; - - prompt_toolkit0_45 = buildPythonPackage rec { - name = "prompt_toolkit-${version}"; - version = "0.45"; - - src = pkgs.fetchurl { - sha256 = "19lp15rc0rq4jqaacg2a38cdgfy2avhf5v97yanasx4n2swx4gsm"; + sha256 = "1yq9nis1b2rgpndi2rqh4divf6j22jjva83r5z8jf7iffywmr8hs"; url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz"; }; @@ -10073,7 +10379,7 @@ let protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; protobufBuild = protobuf: buildPythonPackage rec { inherit (protobuf) name src; - disabled = isPy3k; + disabled = isPy3k || isPyPy; propagatedBuildInputs = with self; [ protobuf google_apputils ]; @@ -10396,7 +10702,6 @@ let description = "A collection of tools for internationalizing Python applications"; license = "BSD"; maintainers = with maintainers; [ garbas ]; - platforms = platforms.linux; }; }); @@ -10535,6 +10840,10 @@ let sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14"; }; + prePatch = '' + sed -i -e "s|if type(driver_id)==int|if type(driver_id) in (int, long)|g" cdio.py + ''; + preConfigure = '' patchShebangs . ''; @@ -11614,11 +11923,11 @@ let }; pymongo = buildPythonPackage rec { - name = "pymongo-2.8"; + name = "pymongo-3.0.3"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz"; - sha256 = "0d9rlxghqg9dqmcmrlf1lw9ap2g6npv6q4slp5agnm7vci9zchq5"; + sha256 = "3c6b2317f8031bc1e200fd1ea35f00a96f4569e3f3f220a5e66ab6227d96ccaf"; }; doCheck = false; @@ -11630,6 +11939,24 @@ let }; }; + pyperclip = buildPythonPackage rec { + version = "1.5.11"; + name = "pyperclip-${version}"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/pyperclip/${name}.zip"; + sha256 = "07q8krmi7phizzp192x3j7xbk1gzhc1kc3jp4mxrm32dn84sp1vh"; + }; + + doCheck = false; + + meta = { + homepage = "https://github.com/asweigart/pyperclip"; + license = licenses.bsdOriginal; + description = "cross-platform clipboard module"; + }; + }; + pysphere = buildPythonPackage rec { name = "pysphere-0.1.8"; @@ -11776,6 +12103,10 @@ let # package, apparently some kind of plugin. doCheck = false; + prePatch = optionalString isPyPy '' + grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" + ''; + meta = { description = "Pyutil, a collection of mature utilities for Python programmers"; @@ -11875,11 +12206,11 @@ let pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.10"; + name = "PyYAML-3.11"; src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "1r127fa354ppb667f4acxlzwxixap1jgzjrr790bw8mcpxv2hqaa"; + sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"; }; buildInputs = with self; [ pkgs.pyrex ]; @@ -12032,35 +12363,36 @@ let }; }; - qscintilla = pkgs.stdenv.mkDerivation rec { - # TODO: Qt5 support - name = "qscintilla-${version}"; - version = pkgs.qscintilla.version; - disabled = isPy3k || isPyPy; + qscintilla = if isPy3k || isPyPy + then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" + else pkgs.stdenv.mkDerivation rec { + # TODO: Qt5 support + name = "qscintilla-${version}"; + version = pkgs.qscintilla.version; - src = pkgs.qscintilla.src; + src = pkgs.qscintilla.src; - buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; + buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; - preConfigure = '' - mkdir -p $out - lndir ${pkgs.pyqt4} $out - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla}/include \ - -o ${pkgs.qscintilla}/lib \ - --sipdir $out/share/sip - ''; + preConfigure = '' + mkdir -p $out + lndir ${pkgs.pyqt4} $out + cd Python + ${python.executable} ./configure-old.py \ + --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ + --apidir $out/api/${python.libPrefix} \ + -n ${pkgs.qscintilla}/include \ + -o ${pkgs.qscintilla}/lib \ + --sipdir $out/share/sip + ''; - meta = with stdenv.lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = [ "abcz2.uprola@gmail.com" ]; - platforms = platforms.linux; + meta = with stdenv.lib; { + description = "A Python binding to QScintilla, Qt based text editing control"; + license = licenses.lgpl21Plus; + maintainers = [ "abcz2.uprola@gmail.com" ]; + platforms = platforms.linux; + }; }; - }; qserve = buildPythonPackage rec { @@ -12688,16 +13020,28 @@ let scikitlearn = buildPythonPackage rec { - name = "scikit-learn-0.16.1"; + name = "scikit-learn-${version}"; + version = "0.16.1"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz"; - sha256 = "1r761qmsq2mnl8sapplbx0ipj6i7ppr2cmz009q5rjana0liwwn0"; + url = "https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz"; + sha256 = "140skabifgc7lvvj873pnzlwx0ni6q8qkrsyad2ccjb3h8rxzkih"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ]; + patches = [ + (pkgs.fetchurl { + url = "https://patch-diff.githubusercontent.com/raw/scikit-learn/scikit-learn/pull/5197.patch"; + sha256 = "1b261wcvim6s0sqmd20jylwz09g5bh3xzhagjlslmv4q50qxpvkg"; + }) + ]; + + postPatch = optionalString stdenv.isi686 '' + sed -i -e "s|test_standard_scaler_numerical_stability|_skip_test_standard_scaler_numerical_stability|g" sklearn/preprocessing/tests/test_data.py + ''; + buildPhase = '' ${self.python.executable} setup.py build_ext -i --fcompiler='gnu95' ''; @@ -12884,6 +13228,30 @@ let }; }); + simpleldap = buildPythonPackage rec { + version = "0.8"; + name = "simpleldap-${version}"; + + propagatedBuildInputs = with self; [ ldap ]; + buildInputs = with self; [ pep8 pytest tox ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/simpleldap/simpleldap-${version}.tar.gz"; + md5 = "f8a95b24895596338032ca4b4450f1de"; + }; + + meta = { + description = "A module that makes simple LDAP usage simple"; + longDescription = '' + A small wrapper around the python-ldap library that provides a more + Pythonic interface for LDAP server connections, LDAP objects, and the + common get and search operations. + ''; + license = licenses.mit; + maintainers = with maintainers; [ layus ]; + }; + }; + simpleparse = buildPythonPackage rec { version = "2.1.1"; name = "simpleparse-${version}"; @@ -13015,16 +13383,17 @@ let }; stevedore = buildPythonPackage rec { - name = "stevedore-0.15"; + name = "stevedore-1.7.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/stevedore/${name}.tar.gz"; - sha256 = "bec9269cbfa58de4f0849ec79bb7d54eeeed9df8b5fbfa1637fbc68062822847"; + sha256 = "149pjc0c3z6khjisn4yil3f94qjnzwafz093wc8rrzbw828qdkv8"; }; - buildInputs = with self; [ pbr pip ] ++ optional isPy26 argparse; + doCheck = false; - propagatedBuildInputs = with self; [ setuptools ]; + buildInputs = with self; [ oslosphinx ]; + propagatedBuildInputs = with self; [ pbr six argparse ]; meta = { description = "Manage dynamic plugins for Python applications"; @@ -13033,6 +13402,27 @@ let }; }; + tidylib = buildPythonPackage rec { + version = "0.2.4"; + name = "pytidylib-${version}"; + + propagatedBuildInputs = [ pkgs.html-tidy ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytidylib/pytidylib-${version}.tar.gz"; + md5 = "2a28267370c9409b592cdb786649cb25"; + }; + + patchPhase = '' + sed -i 's#load_library(name)#load_library("${pkgs.html-tidy}/lib/libtidy.so")#' tidylib/__init__.py + ''; + + meta = { + homepage = " http://countergram.com/open-source/pytidylib/"; + maintainers = with maintainers; [ layus ]; + }; + }; + timelib = buildPythonPackage rec { name = "timelib-0.2.4"; @@ -13204,6 +13594,20 @@ let }; }; + semantic-version = buildPythonPackage rec { + name = "semantic_version-2.4.2"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/semantic_version/${name}.tar.gz"; + md5 = "fd7d5ade76e78d8540b9a4044496a57c"; + }; + + meta = { + description = "A library implementing the 'SemVer' scheme"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; src = pkgs.fetchurl { @@ -13221,11 +13625,11 @@ let sh = buildPythonPackage rec { - name = "sh-1.08"; + name = "sh-1.11"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/sh/${name}.tar.gz"; - md5 = "4028bcba85daa0aef579ed24261e88a3"; + md5 = "7af8df6c92d29ff927b6db0146bddec3"; }; doCheck = false; @@ -13239,14 +13643,14 @@ let sipsimple = buildPythonPackage rec { name = "sipsimple-${version}"; - version = "2.5.0"; + version = "2.5.1"; disabled = isPy3k; configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; src = pkgs.fetchurl { url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; - sha256 = "1k97pdpqjs5dw7v73082jpqhv6xhlrdy987qbdb9a9zvfiz7q8sj"; + sha256 = "0vpy2vss8667c0kp1k8vybl38nxp7kr2v2wa8sngrgzd65m6ww5p"; }; propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib lxml ]; @@ -13516,6 +13920,10 @@ let }; }); + spyder = callPackage ../applications/science/spyder { + rope = if isPy3k then null else self.rope; + }; + sqlalchemy = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.7.10"; disabled = isPy34; @@ -13646,11 +14054,11 @@ let sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; - version = "0.1.14"; + version = "0.1.16"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz"; - sha256 = "1w6shyh7n139cp636sym0frdyiwybw1m7gd2l4s3d7xbaccf6qg5"; + sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337"; }; meta = { @@ -14496,7 +14904,28 @@ let }; }; + upass = buildPythonPackage rec { + version = "0.1.2"; + name = "upass-${version}"; + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/u/upass/upass-${version}.tar.gz"; + sha256 = "1navsygidw77kr8ap8wlfwvjn3gf0chrq896yv8s4nfmaqpm39zc"; + }; + + propagatedBuildInputs = with pythonPackages; [ + pyperclip + urwid + ]; + + doCheck = false; + + meta = { + description = "Console UI for pass"; + homepage = https://github.com/Kwpolska/upass; + license = licenses.bsd3; + }; + }; update_checker = pythonPackages.buildPythonPackage rec { name = "update_checker-0.11"; @@ -14581,6 +15010,24 @@ let }; }; + virtual-display = buildPythonPackage rec { + name = "PyVirtualDisplay-0.1.5"; + + propagatedBuildInputs = with self; [ easy-process ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/P/PyVirtualDisplay/${name}.tar.gz"; + md5 = "90b65fe15b81788c2e208d124e3a3c14"; + }; + + meta = { + description = "python wrapper for Xvfb, Xephyr and Xvnc"; + homepage = "https://github.com/ponty/pyvirtualdisplay"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ layus ]; + }; + }; + virtualenv = buildPythonPackage rec { name = "virtualenv-1.11.6"; src = pkgs.fetchurl { @@ -14798,6 +15245,28 @@ let }; }; + web = buildPythonPackage rec { + version = "0.37"; + name = "web.py-${version}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/web.py/web.py-${version}.tar.gz"; + md5 = "93375e3f03e74d6bf5c5096a4962a8db"; + }; + + meta = { + description = "Makes web apps"; + longDescription = '' + Think about the ideal way to write a web app. + Write the code to make it happen. + ''; + homepage = "http://webpy.org/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ layus ]; + }; + }; + webob = buildPythonPackage rec { version = "1.4"; name = "webob-${version}"; @@ -15024,6 +15493,25 @@ let }; }); + xray = buildPythonPackage rec { + name = "xray-${version}"; + version = "0.6.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/x/xray/${name}.tar.gz"; + sha256 = "c8c4aadb0d39662a81c259bd609f42708ff31c90012a9dd0a1f9ee56a798196f"; + }; + + buildInputs = with self; [nose]; + propagatedBuildInputs = with self; [numpy pandas]; + + meta = { + description = "N-D labeled arrays and datasets in Python"; + homepage = https://github.com/xray/xray; + license = licenses.asl20; + }; + }; + youtube-dl = callPackage ../tools/misc/youtube-dl { # Release versions don't need pandoc because the formatted man page # is included in the tarball. @@ -16516,11 +17004,11 @@ let libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.17"; + version = "1.2.18"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1v9nkfik75bmcrdqzc8al8qf0dsaw56fzfv2kr8s4058290dplzl"; + sha256 = "0f1ni9nv6zmrfhvv71bs2d5yg0pk01zl3hsz1dh1178c2vpkai90"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ]; @@ -17621,4 +18109,24 @@ let }; }; + willow = buildPythonPackage rec { + name = "willow-${version}"; + version = "0.2.1"; + disabled = pythonOlder "2.7"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/W/Willow/Willow-${version}.tar.gz"; + sha256 = "0mgdpq7cvyvgk0n8ibkym3nsw1xg89kbismsj2y186ldcyxfajwa"; + }; + + propagatedBuildInputs = with self; [ six ]; + + meta = { + description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; + homepage = https://github.com/torchbox/Willow/; + license = licenses.bsd2; + maintainers = with maintainers; [ desiderius ]; + }; + }; + }; in pythonPackages diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 0454288eb014..e79ff5ca57ef 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-08-03"; - rev = "dd3e0cecc30d0efbb50dfe76c83900568502af45"; + version = "2015-08-21"; + rev = "02e31a901d5f0942466ca7730431b547477126b1"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0wlbaspa0mvljhkjjnglxwpp9b4mzcxpkdzrciljxwdsr8jvlz30"; + sha256 = "0jppl2grir4wxc3da24h18h21kvh1wj0iff1b0z9vvx0a1iqp4gm"; }; in |